changeset 1822:4927c8b8de1b

Mass uClibc->musl migration. Not everything yet, but these targets build.
author Rob Landley <rob@landley.net>
date Mon, 30 Nov 2015 16:06:00 -0600
parents d3b5e8a635ea
children 1d233a893085
files sources/sections/musl.build sources/targets/armv4tl sources/targets/armv5l sources/targets/armv6l sources/targets/i486 sources/targets/i586 sources/targets/i686 sources/targets/mips sources/targets/mipsel sources/targets/powerpc sources/targets/x86_64
diffstat 11 files changed, 3 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/sources/sections/musl.build	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/sections/musl.build	Mon Nov 30 16:06:00 2015 -0600
@@ -1,6 +1,6 @@
 # Build and install musl
 
-CC= CROSS_COMPILE="$CC_PREFIX" ./configure --prefix=/ &&
+CC= CROSS_COMPILE="$CC_PREFIX" ./configure --prefix=/ $MUSL_FLAGS &&
 DESTDIR="$STAGE_DIR" make -j $CPUS $DO_CROSS all install &&
 echo '#define __MUSL__' >> "$STAGE_DIR"/include/features.h &&
 ln -s libc.so "$STAGE_DIR/lib/ld-musl.so.0"
--- a/sources/targets/armv4tl	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/armv4tl	Mon Nov 30 16:06:00 2015 -0600
@@ -23,13 +23,6 @@
 # This is every bit as ugly as it looks, because it's for gcc.
 export target_cpu_cname=arm9tdmi
 
-UCLIBC_CONFIG="
-TARGET_arm=y
-CONFIG_ARM_EABI=y
-ARCH_WANTS_LITTLE_ENDIAN=y
-DOPIC=y
-"
-
 LINUX_CONFIG="
 
 # Processor config
--- a/sources/targets/armv5l	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/armv5l	Mon Nov 30 16:06:00 2015 -0600
@@ -16,13 +16,6 @@
 
 CONSOLE=ttyAMA0
 
-UCLIBC_CONFIG="
-TARGET_arm=y
-CONFIG_ARM_EABI=y
-ARCH_WANTS_LITTLE_ENDIAN=y
-DOPIC=y
-"
-
 LINUX_CONFIG="
 
 # Processor config
--- a/sources/targets/armv6l	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/armv6l	Mon Nov 30 16:06:00 2015 -0600
@@ -17,13 +17,6 @@
 
 CONSOLE=ttyAMA0
 
-UCLIBC_CONFIG="
-TARGET_arm=y
-CONFIG_ARM_EABI=y
-ARCH_WANTS_LITTLE_ENDIAN=y
-DOPIC=y
-"
-
 LINUX_CONFIG="
 
 # Processor config
--- a/sources/targets/i486	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/i486	Mon Nov 30 16:06:00 2015 -0600
@@ -17,12 +17,6 @@
 
 CONSOLE=ttyS0
 
-UCLIBC_CONFIG="
-TARGET_i386=y
-CONFIG_486=y
-UCLIBC_HAS_FPU=y
-"
-
 LINUX_CONFIG="
 CONFIG_M486=y
 CONFIG_ACPI=y
--- a/sources/targets/i586	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/i586	Mon Nov 30 16:06:00 2015 -0600
@@ -15,12 +15,6 @@
 
 CONSOLE=ttyS0
 
-UCLIBC_CONFIG="
-TARGET_i386=y
-CONFIG_586=y
-UCLIBC_HAS_FPU=y
-"
-
 LINUX_CONFIG="
 CONFIG_M586=y
 CONFIG_ACPI=y
--- a/sources/targets/i686	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/i686	Mon Nov 30 16:06:00 2015 -0600
@@ -8,13 +8,6 @@
 
 CONSOLE=ttyS0
 
-UCLIBC_CONFIG="
-ARCH_HAS_MMU=y
-TARGET_i386=y
-CONFIG_PENTIUMIII=y
-UCLIBC_HAS_FPU=y
-"
-
 LINUX_CONFIG="
 CONFIG_MPENTIUMII=y
 CONFIG_ACPI=y
--- a/sources/targets/mips	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/mips	Mon Nov 30 16:06:00 2015 -0600
@@ -4,15 +4,11 @@
 KERNEL_PATH=vmlinux
 BINUTILS_FLAGS=
 GCC_FLAGS=
+MUSL_FLAGS=--disable-optimize # -O3 internal compiler errors in malloc, use -Os
 QEMU_TEST=mips
 
 CONSOLE=ttyS0
 
-UCLIBC_CONFIG="
-TARGET_mips=y
-UCLIBC_HAS_FPU=y
-"
-
 LINUX_CONFIG="
 CONFIG_MIPS_MALTA=y
 CONFIG_CPU_MIPS32_R2=y
--- a/sources/targets/mipsel	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/mipsel	Mon Nov 30 16:06:00 2015 -0600
@@ -4,16 +4,11 @@
 KERNEL_PATH=vmlinux
 BINUTILS_FLAGS=
 GCC_FLAGS=
+MUSL_FLAGS=--disable-optimize # -O3 internal compiler errors in malloc, use -Os
 QEMU_TEST=mipsel
 
 CONSOLE=ttyS0
 
-UCLIBC_CONFIG="
-TARGET_mips=y
-ARCH_WANTS_LITTLE_ENDIAN=y
-UCLIBC_HAS_FPU=y
-"
-
 LINUX_CONFIG="
 CONFIG_MIPS_MALTA=y
 CONFIG_CPU_LITTLE_ENDIAN=y
--- a/sources/targets/powerpc	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/powerpc	Mon Nov 30 16:06:00 2015 -0600
@@ -20,11 +20,6 @@
 
 CONSOLE=ttyS0
 
-UCLIBC_CONFIG="
-TARGET_powerpc=y
-UCLIBC_HAS_FPU=y
-"
-
 LINUX_CONFIG="
 CONFIG_ALTIVEC=y
 CONFIG_PPC_PMAC=y
--- a/sources/targets/x86_64	Sat Nov 28 16:44:52 2015 -0600
+++ b/sources/targets/x86_64	Mon Nov 30 16:06:00 2015 -0600
@@ -12,11 +12,6 @@
 
 CONSOLE=ttyS0
 
-#UCLIBC_CONFIG="
-#TARGET_x86_64=y
-#UCLIBC_HAS_FPU=y
-#"
-
 LINUX_CONFIG="
 CONFIG_64BIT=y
 CONFIG_ACPI=y