[Glibc-bsd-commits] r5214 - in trunk/glibc-ports: . kfreebsd kfreebsd/i386 kfreebsd/mips kfreebsd/x86_64

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2013-12-03 13:28:18 +0000 (Tue, 03 Dec 2013)
New Revision: 5214

Removed:
   trunk/glibc-ports/gen_linuxthreads_patch.sh
   trunk/glibc-ports/kfreebsd/i386/linuxthreads/
   trunk/glibc-ports/kfreebsd/linuxthreads/
   trunk/glibc-ports/kfreebsd/mips/linuxthreads/
   trunk/glibc-ports/kfreebsd/x86_64/linuxthreads/
Modified:
   trunk/glibc-ports/kfreebsd/configure
   trunk/glibc-ports/kfreebsd/configure.in
   trunk/glibc-ports/kfreebsd/i386/Makefile
Log:
Remove linuxthreads code


Deleted: trunk/glibc-ports/gen_linuxthreads_patch.sh
===================================================================
--- trunk/glibc-ports/gen_linuxthreads_patch.sh	2013-12-03 09:46:34 UTC (rev 5213)
+++ trunk/glibc-ports/gen_linuxthreads_patch.sh	2013-12-03 13:28:18 UTC (rev 5214)
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -ex
-LANG=C
-
-# linuxthreads and linuxthreads_db dirs
-tmp=`mktemp -d`
-mkdir -p ${tmp}/b/
-cp -a linuxthreads ${tmp}/b/
-cp -a linuxthreads_db ${tmp}/b/
-(cd ${tmp} && diff -x .svn -Nurd null b/ ) | \
-   sed -e "sz^--- null/linuxthread.*z--- /dev/nullz" \
-       -e "\z^diff -x .svn -Nurd null/linuxthread.*zd" \
-       -e "\z^+++ b/linuxthreadszsz\t20[0-9][0-9].*zz" \
-   > linuxthreads.diff
-#rm -rf ${tmp}

Modified: trunk/glibc-ports/kfreebsd/configure
===================================================================
--- trunk/glibc-ports/kfreebsd/configure	2013-12-03 09:46:34 UTC (rev 5213)
+++ trunk/glibc-ports/kfreebsd/configure	2013-12-03 13:28:18 UTC (rev 5214)
@@ -328,38 +328,29 @@
 libc_cv_gcc_unwind_find_fde=no
 
 
-# Under kFreeBSD the LinuxThreads or (may be later) FBTL add-on should be available.
+# Under kFreeBSD the FBTL add-on should be available.
 case $add_ons in
-  # Only one of the add-ons should be available.
-  *linuxthreads*fbtl*|*fbtl*linuxthreads*)
-    echo "\
-*** LinuxThreads and FBTL add-ons are both available.  Only one must be used."
-    exit 1
-    ;;
   # It is available.  Good.
-  *linuxthreads*)
-    linuxthreads_missing=
-    ;;
   *fbtl*)
-    linuxthreads_missing=
+    fbtl_missing=
     ;;
   *)
-    linuxthreads_missing=yes
+    fbtl_missing=yes
     ;;
 esac
 
-if test "$linuxthreads_missing"; then
+if test "$fbtl_missing"; then
   if test $enable_sanity = yes; then
     echo "\
 *** On GNU/kFreeBSD systems it is normal to compile GNU libc with the
-*** \`linuxthreads' add-on.  Without that, the library will be
+*** \`fbtl' add-on.  Without that, the library will be
 *** incompatible with normal GNU/kFreeBSD systems.
 *** If you really mean to not use this add-on, run configure again
 *** using the extra parameter \`--disable-sanity-checks'."
     exit 1
   else
     echo "\
-*** WARNING: Are you sure you do not want to use the \`linuxthreads'
+*** WARNING: Are you sure you do not want to use the \`fbtl'
 *** add-on?"
   fi
 fi

Modified: trunk/glibc-ports/kfreebsd/configure.in
===================================================================
--- trunk/glibc-ports/kfreebsd/configure.in	2013-12-03 09:46:34 UTC (rev 5213)
+++ trunk/glibc-ports/kfreebsd/configure.in	2013-12-03 13:28:18 UTC (rev 5214)
@@ -166,38 +166,29 @@
 libc_cv_gcc_unwind_find_fde=no
 
 
-# Under kFreeBSD the LinuxThreads or (may be later) FBTL add-on should be available.
+# Under kFreeBSD the FBTL add-on should be available.
 case $add_ons in
-  # Only one of the add-ons should be available.
-  *linuxthreads*fbtl*|*fbtl*linuxthreads*)
-    echo "\
-*** LinuxThreads and FBTL add-ons are both available.  Only one must be used."
-    exit 1
-    ;;
   # It is available.  Good.
-  *linuxthreads*)
-    linuxthreads_missing=
-    ;;
   *fbtl*)
-    linuxthreads_missing=
+    fbtl_missing=
     ;;
   *)
-    linuxthreads_missing=yes
+    fbtl_missing=yes
     ;;
 esac
 
-if test "$linuxthreads_missing"; then
+if test "$fbtl_missing"; then
   if test $enable_sanity = yes; then
     echo "\
 *** On GNU/kFreeBSD systems it is normal to compile GNU libc with the
-*** \`linuxthreads' add-on.  Without that, the library will be
+*** \`fbtl' add-on.  Without that, the library will be
 *** incompatible with normal GNU/kFreeBSD systems.
 *** If you really mean to not use this add-on, run configure again
 *** using the extra parameter \`--disable-sanity-checks'."
     exit 1
   else
     echo "\
-*** WARNING: Are you sure you do not want to use the \`linuxthreads'
+*** WARNING: Are you sure you do not want to use the \`fbtl'
 *** add-on?"
   fi
 fi

Modified: trunk/glibc-ports/kfreebsd/i386/Makefile
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/Makefile	2013-12-03 09:46:34 UTC (rev 5213)
+++ trunk/glibc-ports/kfreebsd/i386/Makefile	2013-12-03 13:28:18 UTC (rev 5214)
@@ -1,10 +1,6 @@
 # The default ABI is 32.
 default-abi := 32
 
-ifeq ($(subdir),linuxthreads)
-CFLAGS-pt-initfini.s += -fno-asynchronous-unwind-tables
-endif
-
 # Additional header files to be installed in $prefix/include:
 
 ifeq ($(subdir),misc)