changeset 1340:5e22b534839a

Switch to from pthreads.old to NPTL.
author Rob Landley <rob@landley.net>
date Fri, 18 Mar 2011 23:20:13 -0500
parents 6032ba232e3f
children d4eb237dcc6f
files sources/baseconfig-uClibc sources/sections/uClibc.build sources/targets/armv4eb/settings sources/targets/armv4l/settings sources/targets/armv4tl/settings sources/targets/armv5l/settings sources/targets/armv6l/settings sources/targets/i486/settings sources/targets/i586/settings sources/targets/i686/settings sources/targets/m68k/settings sources/targets/mips/settings sources/targets/mips64/settings sources/targets/mipsel/settings sources/targets/powerpc/settings sources/targets/sh4/settings sources/targets/sparc/settings sources/targets/x86_64/settings
diffstat 18 files changed, 26 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/sources/baseconfig-uClibc	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/baseconfig-uClibc	Fri Mar 18 23:20:13 2011 -0500
@@ -28,9 +28,7 @@
 LDSO_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 UCLIBC_CTOR_DTOR=y
-LINUXTHREADS_OLD=y
-#UCLIBC_HAS_THREADS_NATIVE=y
-PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 MALLOC_GLIBC_COMPAT=y
--- a/sources/sections/uClibc.build	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/sections/uClibc.build	Fri Mar 18 23:20:13 2011 -0500
@@ -1,5 +1,12 @@
 # Build and install uClibc
 
+# Work around a uClibc bug: it tries to use assembly directives on binutils
+# versions that don't have them.
+
+find . -name uClibc_arch_features.h | xargs sed -i 's/\#define \(__UCLIBC_HAVE_ASM_CFI_DIRECTIVES__\)/#undef \1/'
+
+[ ! -z "$BUILD_VERBOSE" ] && VERBOSITY=V=2
+
 make_uClibc()
 {
   make -j $CPUS $VERBOSITY CROSS="${ARCH}-" \
@@ -18,8 +25,8 @@
 cp .config "$STAGE_DIR/src/config-uClibc" &&
 make_uClibc install || dienow
 
-# Old versions of uClibc couldn't be told not to hardwire absolute paths
-# into their linker scripts.  This isn't needed for current versions, and
+# Old versions of uClibc (0.9.30-ish) couldn't be told not to hardwire absolute
+# paths into their linker scripts.  This isn't needed for current versions, and
 # is allowed to fail if HAVE_SHARED=n
 
 sed -i 's@/lib/@@g' "$STAGE_DIR/lib/libc.so" 2>/dev/null
--- a/sources/targets/armv4eb/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/armv4eb/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=arm
 KERNEL_PATH=arch/${KARCH}/boot/zImage
-GCC_FLAGS="--with-float=soft --enable-sjlj-exceptions"
+GCC_FLAGS="--with-float=soft"
 BINUTILS_FLAGS=
 QEMU_TEST=$KARCH
 
--- a/sources/targets/armv4l/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/armv4l/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=arm
 KERNEL_PATH=arch/${KARCH}/boot/zImage
-GCC_FLAGS="--with-float=soft --enable-sjlj-exceptions"
+GCC_FLAGS="--with-float=soft"
 BINUTILS_FLAGS=
 QEMU_TEST=$KARCH
 
--- a/sources/targets/armv4tl/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/armv4tl/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=arm
 KERNEL_PATH=arch/${KARCH}/boot/zImage
-GCC_FLAGS="--with-march=armv4t --with-float=soft --disable-sjlj-exceptions"
+GCC_FLAGS="--with-march=armv4t --with-float=soft"
 BINUTILS_FLAGS=
 QEMU_TEST=$KARCH
 
--- a/sources/targets/armv5l/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/armv5l/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=arm
 KERNEL_PATH=arch/${KARCH}/boot/zImage
-GCC_FLAGS="--with-march=armv5 --with-mfloat-abi=soft --with-mfp=vfp --disable-sjlj-exceptions"
+GCC_FLAGS="--with-march=armv5 --with-mfloat-abi=soft --with-mfp=vfp"
 BINUTILS_FLAGS=
 QEMU_TEST=$KARCH
 
--- a/sources/targets/armv6l/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/armv6l/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -2,7 +2,7 @@
 
 KARCH=arm
 KERNEL_PATH=arch/${KARCH}/boot/zImage
-GCC_FLAGS="--with-march=armv6 --with-mfloat-abi=soft --with-mfp=vfp --disable-sjlj-exceptions" 
+GCC_FLAGS="--with-march=armv6 --with-mfloat-abi=soft --with-mfp=vfp" 
 BINUTILS_FLAGS=
 QEMU_TEST=$KARCH
 
--- a/sources/targets/i486/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/i486/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,7 +1,7 @@
 KARCH=i386
 KERNEL_PATH=arch/${KARCH}/boot/bzImage
 BINUTILS_FLAGS=
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=$KARCH
 
 ROOT=hda
--- a/sources/targets/i586/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/i586/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,7 +1,7 @@
 KARCH=i386
 KERNEL_PATH=arch/${KARCH}/boot/bzImage
 BINUTILS_FLAGS=
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=$KARCH
 
 ROOT=hda
--- a/sources/targets/i686/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/i686/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,7 +1,7 @@
 KARCH=i386
 KERNEL_PATH=arch/${KARCH}/boot/bzImage
 BINUTILS_FLAGS=
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=$KARCH
 
 CONSOLE=ttyS0
--- a/sources/targets/m68k/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/m68k/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=m68k
 KERNEL_PATH=vmlinux
-GCC_FLAGS="--enable-sjlj-exceptions" # "--with-float=soft"
+GCC_FLAGS= # "--with-float=soft"
 BINUTILS_FLAGS=
 QEMU_TEST= #$KARCH
 
--- a/sources/targets/mips/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/mips/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,7 +1,7 @@
 KARCH=mips
 KERNEL_PATH=vmlinux
 BINUTILS_FLAGS=
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=mips
 
 ROOT=hda
--- a/sources/targets/mips64/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/mips64/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,7 +1,7 @@
 KARCH=mips
 KERNEL_PATH=vmlinux
 BINUTILS_FLAGS="--enable-64-bit-bfd"
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=mips64
 
 ROOT=hda
--- a/sources/targets/mipsel/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/mipsel/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,7 +1,7 @@
 KARCH=mips
 KERNEL_PATH=vmlinux
 BINUTILS_FLAGS=
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=mipsel
 
 ROOT=hda
--- a/sources/targets/powerpc/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/powerpc/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=powerpc
 KERNEL_PATH=vmlinux
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 BINUTILS_FLAGS=
 QEMU_TEST=ppc
 
--- a/sources/targets/sh4/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/sh4/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=sh
 KERNEL_PATH=arch/${KARCH}/boot/zImage
-GCC_FLAGS="--enable-sjlj-exceptions" #"--with-cpu=m4-nofpu"
+GCC_FLAGS= #"--with-cpu=m4-nofpu"
 BINUTILS_FLAGS=
 QEMU_TEST=$KARCH
 CROSS_TARGET=sh-superh-linux
--- a/sources/targets/sparc/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/sparc/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -3,7 +3,7 @@
 KARCH=sparc
 KERNEL_PATH=arch/${KARCH}/boot/image
 BINUTILS_FLAGS=
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 QEMU_TEST=$KARCH
 
 BUILD_STATIC=all
--- a/sources/targets/x86_64/settings	Fri Mar 18 23:19:02 2011 -0500
+++ b/sources/targets/x86_64/settings	Fri Mar 18 23:20:13 2011 -0500
@@ -1,6 +1,6 @@
 KARCH=x86_64
 KERNEL_PATH=arch/${KARCH}/boot/bzImage
-GCC_FLAGS="--enable-sjlj-exceptions"
+GCC_FLAGS=
 BINUTILS_FLAGS="--enable-64-bit-bfd"
 QEMU_TEST=