[Glibc-bsd-commits] r4554 - in trunk/glibc-ports: fbtl fbtl_db

[Petr Salinger]

Author: ps-guest
Date: 2013-06-21 15:03:38 +0000 (Fri, 21 Jun 2013)
New Revision: 4554

Modified:
   trunk/glibc-ports/fbtl/Makeconfig
   trunk/glibc-ports/fbtl/Makefile
   trunk/glibc-ports/fbtl/configure
   trunk/glibc-ports/fbtl/descr.h
   trunk/glibc-ports/fbtl/libc-cancellation.c
   trunk/glibc-ports/fbtl/pthread_create.c
   trunk/glibc-ports/fbtl/sigaction.c
   trunk/glibc-ports/fbtl_db/Makefile
   trunk/glibc-ports/fbtl_db/thread_dbP.h
Log:
some nptl -> fbtl



Modified: trunk/glibc-ports/fbtl/Makeconfig
===================================================================
--- trunk/glibc-ports/fbtl/Makeconfig	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/Makeconfig	2013-06-21 15:03:38 UTC (rev 4554)
@@ -21,11 +21,11 @@
 
 have-thread-library = yes
 
-shared-thread-library = $(common-objpfx)nptl/libpthread_nonshared.a \
-			$(common-objpfx)nptl/libpthread.so
-static-thread-library = $(common-objpfx)nptl/libpthread.a
+shared-thread-library = $(common-objpfx)fbtl/libpthread_nonshared.a \
+			$(common-objpfx)fbtl/libpthread.so
+static-thread-library = $(common-objpfx)fbtl/libpthread.a
 
-rpath-dirs += nptl
+rpath-dirs += fbtl
 
 # This makes for ptw-*.? object rules in sysd-rules.
 ptw-CPPFLAGS := -DPTW

Modified: trunk/glibc-ports/fbtl/Makefile
===================================================================
--- trunk/glibc-ports/fbtl/Makefile	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/Makefile	2013-06-21 15:03:38 UTC (rev 4554)
@@ -18,7 +18,7 @@
 #
 #	Sub-makefile for NPTL portion of the library.
 #
-subdir	:= nptl
+subdir	:= fbtl
 
 headers := pthread.h semaphore.h bits/semaphore.h
 
@@ -504,7 +504,7 @@
 LDLIBS-tst-cancel24 = $(no-as-needed) -lstdc++
 LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24)
 
-extra-B-pthread.so = -B$(common-objpfx)nptl/
+extra-B-pthread.so = -B$(common-objpfx)fbtl/
 $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
 $(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs))
 $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs))

Modified: trunk/glibc-ports/fbtl/configure
===================================================================
--- trunk/glibc-ports/fbtl/configure	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/configure	2013-06-21 15:03:38 UTC (rev 4554)
@@ -2,12 +2,12 @@
 # We're obliged to give here the canonical name that will be used to
 # as a subdirectory to search for in other add-ons' sysdeps trees.
 
-libc_add_on_canonical=nptl
+libc_add_on_canonical=fbtl
 
 # Only linux configurations support NPTL.
 if test $add_ons_automatic = yes; then
   case "$config_os" in
-  *linux*) ;;
+#  *linux*) ;;
   *) libc_add_on= ;;
   esac
 fi

Modified: trunk/glibc-ports/fbtl/descr.h
===================================================================
--- trunk/glibc-ports/fbtl/descr.h	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/descr.h	2013-06-21 15:03:38 UTC (rev 4554)
@@ -30,7 +30,7 @@
 #include <lowlevellock.h>
 #include <pthreaddef.h>
 #include <dl-sysdep.h>
-#include "../nptl_db/thread_db.h"
+#include "../fbtl_db/thread_db.h"
 #include <tls.h>
 #ifdef HAVE_FORCED_UNWIND
 # include <unwind.h>

Modified: trunk/glibc-ports/fbtl/libc-cancellation.c
===================================================================
--- trunk/glibc-ports/fbtl/libc-cancellation.c	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/libc-cancellation.c	2013-06-21 15:03:38 UTC (rev 4554)
@@ -21,4 +21,4 @@
 
 #define __pthread_enable_asynccancel __libc_enable_asynccancel
 #define __pthread_disable_asynccancel __libc_disable_asynccancel
-#include <nptl/cancellation.c>
+#include <fbtl/cancellation.c>

Modified: trunk/glibc-ports/fbtl/pthread_create.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_create.c	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/pthread_create.c	2013-06-21 15:03:38 UTC (rev 4554)
@@ -643,7 +643,7 @@
 

 /* Information for libthread_db.  */
 
-#include "../nptl_db/db_info.c"
+#include "../fbtl_db/db_info.c"
 

 /* If pthread_create is present, libgcc_eh.a and libsupc++.a expects some other POSIX thread
    functions to be present as well.  */

Modified: trunk/glibc-ports/fbtl/sigaction.c
===================================================================
--- trunk/glibc-ports/fbtl/sigaction.c	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl/sigaction.c	2013-06-21 15:03:38 UTC (rev 4554)
@@ -21,7 +21,7 @@
    included in the real implementation to provide the wrapper around
    __libc_sigaction.  */
 
-#include <nptl/pthreadP.h>
+#include <fbtl/pthreadP.h>
 
 /* We use the libc implementation but we tell it to not allow
    SIGCANCEL or SIGTIMER to be handled.  */

Modified: trunk/glibc-ports/fbtl_db/Makefile
===================================================================
--- trunk/glibc-ports/fbtl_db/Makefile	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl_db/Makefile	2013-06-21 15:03:38 UTC (rev 4554)
@@ -17,9 +17,9 @@
 
 # Makefile for NPTL debug library subdirectory of GNU C Library.
 
-subdir          := nptl_db
+subdir          := fbtl_db
 
-nptl_db-version = 1.0
+fbtl_db-version = 1.0
 
 extra-libs = libthread_db
 extra-libs-others := $(extra-libs)
@@ -53,7 +53,7 @@
 
 tests: $(objpfx)db-symbols.out
 $(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \
-			 $(common-objpfx)nptl/libpthread.so
+			 $(common-objpfx)fbtl/libpthread.so
 	LC_ALL=C $(READELF) -W -s $(filter %.so,$^) | $(AWK) -f $< > $@
 
 $(objpfx)db-symbols.v.i: db-symbols.awk

Modified: trunk/glibc-ports/fbtl_db/thread_dbP.h
===================================================================
--- trunk/glibc-ports/fbtl_db/thread_dbP.h	2013-06-21 14:09:00 UTC (rev 4553)
+++ trunk/glibc-ports/fbtl_db/thread_dbP.h	2013-06-21 15:03:38 UTC (rev 4554)
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include "proc_service.h"
 #include "thread_db.h"
-#include "../nptl/pthreadP.h"  	/* This is for *_BITMASK only.  */
+#include "../fbtl/pthreadP.h"  	/* This is for *_BITMASK only.  */
 #include <list.h>
 
 /* Indeces for the symbol names.  */