svn commit: branches/uClibc-nptl: extra/Configs include ldso/include ldso etc...

sjhill at uclibc.org sjhill at uclibc.org
Sat Sep 24 16:37:29 UTC 2005 

Author: sjhill
Date: 2005-09-24 09:37:17 -0700 (Sat, 24 Sep 2005)
New Revision: 11628

Log:
Rename option PTHREADS_NATIVE to be UCLIBC_HAS_THREADS_NATIVE instead. What a stupid name to start with. What idiot thought of that?


Modified:
   branches/uClibc-nptl/Rules.mak
   branches/uClibc-nptl/extra/Configs/Config.in
   branches/uClibc-nptl/include/netdb.h
   branches/uClibc-nptl/include/resolv.h
   branches/uClibc-nptl/include/time.h
   branches/uClibc-nptl/ldso/include/ldso.h
   branches/uClibc-nptl/ldso/ldso/Makefile
   branches/uClibc-nptl/ldso/libdl/Makefile
   branches/uClibc-nptl/libc/inet/resolv.c
   branches/uClibc-nptl/libc/inet/rpc/rpc_thread.c
   branches/uClibc-nptl/libc/misc/internals/errno.c
   branches/uClibc-nptl/libc/stdio/Makefile
   branches/uClibc-nptl/libc/stdlib/malloc-standard/Makefile
   branches/uClibc-nptl/libc/sysdeps/linux/alpha/Makefile
   branches/uClibc-nptl/libc/sysdeps/linux/mips/__syscall_error.c
   branches/uClibc-nptl/libpthread/Makefile


Changeset:
Modified: branches/uClibc-nptl/Rules.mak
===================================================================
--- branches/uClibc-nptl/Rules.mak	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/Rules.mak	2005-09-24 16:37:17 UTC (rev 11628)
@@ -309,7 +309,7 @@
 #
 # Thread includes are needed to compile some files.
 #
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 PTDIR	:= $(TOPDIR)libpthread/nptl/
 PTINC	:= -I$(PTDIR)compat					\
 	   -I$(PTDIR)sysdeps/unix/sysv/linux/$(TARGET_ARCH)	\
@@ -335,7 +335,7 @@
 #
 # Test for TLS if NPTL support was selected.
 #
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 GCC_HAS_TLS=$(shell \
 	echo "extern __thread int foo;" | $(CC) -o /dev/null -S -xc - 2>&1)
 ifneq ($(GCC_HAS_TLS),)

Modified: branches/uClibc-nptl/extra/Configs/Config.in
===================================================================
--- branches/uClibc-nptl/extra/Configs/Config.in	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/extra/Configs/Config.in	2005-09-24 16:37:17 UTC (rev 11628)
@@ -310,7 +310,7 @@
 
 	  If your applications require pthreads, answer Y.
 
-config PTHREADS_NATIVE
+config UCLIBC_HAS_THREADS_NATIVE
 	bool "Native POSIX Threading (NPTL) Support"
 	depends on UCLIBC_HAS_THREADS
 	default n
@@ -1035,7 +1035,7 @@
 config UCLIBC_HAS_STDIO_FUTEXES
 	bool "Use futexes for multithreaded I/O locking"
 	default y
-	depends on PTHREADS_NATIVE
+	depends on UCLIBC_HAS_THREADS_NATIVE
 	help
 	  If you want to compile uClibc to use futexes for low-level
 	  I/O locking, answer Y.  Otherwise, answer N.

Modified: branches/uClibc-nptl/include/netdb.h
===================================================================
--- branches/uClibc-nptl/include/netdb.h	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/include/netdb.h	2005-09-24 16:37:17 UTC (rev 11628)
@@ -57,7 +57,7 @@
    We use a macro to access always the thread-specific `h_errno' variable.
    We always need the extern int here in case internal libc code undefines 
    the macro because it needs access to the underlying storage. */
-#if !defined(__PTHREADS_NATIVE__)
+#if !defined(__UCLIBC_HAS_THREADS_NATIVE__)
 extern int h_errno;
 #endif
 #if defined(__UCLIBC_HAS_THREADS__)
@@ -658,7 +658,7 @@
 __END_DECLS
 
 #ifdef _LIBC
-# ifdef __PTHREADS_NATIVE__
+# ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #  include <tls.h>
 #  undef h_errno
 #  define h_errno h_errno     /* For #ifndef h_errno tests.  */

Modified: branches/uClibc-nptl/include/resolv.h
===================================================================
--- branches/uClibc-nptl/include/resolv.h	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/include/resolv.h	2005-09-24 16:37:17 UTC (rev 11628)
@@ -389,7 +389,7 @@
 
 #endif /* _RESOLV_H_ */
 
-#if defined(__PTHREADS_NATIVE__) && defined(IS_IN_libpthread)
+#if defined(__UCLIBC_HAS_THREADS_NATIVE__) && defined(IS_IN_libpthread)
 # include <tls.h>
 # undef _res
 # define _res (*__resp)

Modified: branches/uClibc-nptl/include/time.h
===================================================================
--- branches/uClibc-nptl/include/time.h	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/include/time.h	2005-09-24 16:37:17 UTC (rev 11628)
@@ -191,7 +191,7 @@
      __THROW __attribute__ ((__const__));
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
-#ifdef __PTHREADS_NATIVE__
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 # define CLOCK_IDFIELD_SIZE	3
 #endif
 

Modified: branches/uClibc-nptl/ldso/include/ldso.h
===================================================================
--- branches/uClibc-nptl/ldso/include/ldso.h	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/ldso/include/ldso.h	2005-09-24 16:37:17 UTC (rev 11628)
@@ -32,7 +32,7 @@
 #include <dl-elf.h>
 #include <dl-hash.h>
 /* Defines USE_TLS */
-#if defined(__PTHREADS_NATIVE__)
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <tls.h>
 #endif
 

Modified: branches/uClibc-nptl/ldso/ldso/Makefile
===================================================================
--- branches/uClibc-nptl/ldso/ldso/Makefile	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/ldso/ldso/Makefile	2005-09-24 16:37:17 UTC (rev 11628)
@@ -37,7 +37,7 @@
 else
 XXFLAGS+=$(OPTIMIZATION)
 endif
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 XXFLAGS+= -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
 	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
 	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include $(PTINC) -DSHARED -DIS_IN_rtld
@@ -79,7 +79,7 @@
 
 all: $(LDSO_FULLNAME)
 
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 $(LDSO_FULLNAME): dl-tls.c $(OBJS) $(DLINK_OBJS)
 else
 $(LDSO_FULLNAME): $(OBJS) $(DLINK_OBJS)

Modified: branches/uClibc-nptl/ldso/libdl/Makefile
===================================================================
--- branches/uClibc-nptl/ldso/libdl/Makefile	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/ldso/libdl/Makefile	2005-09-24 16:37:17 UTC (rev 11628)
@@ -27,7 +27,7 @@
 else
 XXFLAGS+=$(OPTIMIZATION)
 endif
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 XXFLAGS+= $(XARCH_CFLAGS) $(CPU_CFLAGS) \
 	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
 	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I$(TOPDIR)ldso/ldso -I. -I$(TOPDIR)include $(PTINC) -DIS_IN_rtld

Modified: branches/uClibc-nptl/libc/inet/resolv.c
===================================================================
--- branches/uClibc-nptl/libc/inet/resolv.c	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/inet/resolv.c	2005-09-24 16:37:17 UTC (rev 11628)
@@ -1104,7 +1104,7 @@
 	return &_res;
 }
 
-#ifdef __PTHREADS_NATIVE__
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <tls.h>
 __thread struct __res_state *__resp = &_res;
 #endif

Modified: branches/uClibc-nptl/libc/inet/rpc/rpc_thread.c
===================================================================
--- branches/uClibc-nptl/libc/inet/rpc/rpc_thread.c	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/inet/rpc/rpc_thread.c	2005-09-24 16:37:17 UTC (rev 11628)
@@ -9,7 +9,7 @@
 
 /* Variable used in non-threaded applications or for the first thread.  */
 static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
-#ifdef __PTHREADS_NATIVE__
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 static struct rpc_thread_variables *__libc_tsd_RPC_VARS =
      &__libc_tsd_RPC_VARS_mem;
 #else
@@ -82,7 +82,7 @@
 			if (tvp != NULL)
 				__libc_tsd_set (RPC_VARS, tvp);
 			else
-#ifdef __PTHREADS_NATIVE__
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 				tvp = __libc_tsd_RPC_VARS;
 #else
 				tvp = __libc_tsd_RPC_VARS_data;

Modified: branches/uClibc-nptl/libc/misc/internals/errno.c
===================================================================
--- branches/uClibc-nptl/libc/misc/internals/errno.c	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/misc/internals/errno.c	2005-09-24 16:37:17 UTC (rev 11628)
@@ -1,7 +1,7 @@
 #include <features.h>
 #undef errno
 
-#if __PTHREADS_NATIVE__
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <tls.h>
 extern int errno;
 extern __thread int _h_errno;

Modified: branches/uClibc-nptl/libc/stdio/Makefile
===================================================================
--- branches/uClibc-nptl/libc/stdio/Makefile	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/stdio/Makefile	2005-09-24 16:37:17 UTC (rev 11628)
@@ -59,7 +59,7 @@
 
 # pthread functions
 CSRC += flockfile.c ftrylockfile.c funlockfile.c
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
 CSRC += fatal.c
 endif
 

Modified: branches/uClibc-nptl/libc/stdlib/malloc-standard/Makefile
===================================================================
--- branches/uClibc-nptl/libc/stdlib/malloc-standard/Makefile	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/stdlib/malloc-standard/Makefile	2005-09-24 16:37:17 UTC (rev 11628)
@@ -32,7 +32,7 @@
 # calloc.c can be found at uClibc/libc/stdlib/calloc.c
 # valloc.c can be found at uClibc/libc/stdlib/valloc.c
 CSRC=malloc.c calloc.c realloc.c free.c memalign.c mallopt.c mallinfo.c
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 CSRC += thread-freeres.c
 endif
 COBJS=$(patsubst %.c,%.o, $(CSRC))

Modified: branches/uClibc-nptl/libc/sysdeps/linux/alpha/Makefile
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/alpha/Makefile	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/sysdeps/linux/alpha/Makefile	2005-09-24 16:37:17 UTC (rev 11628)
@@ -32,7 +32,7 @@
 
 OBJS=$(SOBJS) $(COBJS)
 
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 COBJS += $(PTDIR)sysdeps/$(TARGET_ARCH)/libc-tls.o
 endif
 
@@ -80,7 +80,7 @@
 	$(AR) $(ARFLAGS) $(TOPDIR)lib/crtn.o
 endif
 
-ifeq ($(PTHREADS_NATIVE),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 $(PTDIR)sysdeps/$(TARGET_ARCH)/libc-tls.o:
 	$(MAKE) -C $(PTDIR)sysdeps/$(TARGET_ARCH) libc-tls.o
 endif

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/__syscall_error.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/__syscall_error.c	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/__syscall_error.c	2005-09-24 16:37:17 UTC (rev 11628)
@@ -22,7 +22,7 @@
 
 /* This routine is jumped to by all the syscall handlers, to stash
  * an error number into errno.  */
-#ifdef __PTHREADS_NATIVE__
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 int __syscall_error(int err_no)
 #else
 int attribute_hidden __syscall_error(int err_no)

Modified: branches/uClibc-nptl/libpthread/Makefile
===================================================================
--- branches/uClibc-nptl/libpthread/Makefile	2005-09-24 16:15:28 UTC (rev 11627)
+++ branches/uClibc-nptl/libpthread/Makefile	2005-09-24 16:37:17 UTC (rev 11628)
@@ -18,7 +18,7 @@
 
 TOPDIR=../
 include $(TOPDIR)Rules.mak
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
 include nptl/Rules.mak
 endif
 
@@ -35,7 +35,7 @@
 LIBTHREAD_DB_SHARED_FULLNAME=libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
 DIRS=
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
 	DIRS+=nptl
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
 	DIRS+=nptl_db
@@ -52,7 +52,7 @@
 	SHARED_END_FILES = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
 endif
 
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
 ALL_SUBDIRS = nptl nptl_db
 else
 ALL_SUBDIRS = linuxthreads linuxthreads_db
@@ -93,7 +93,7 @@
 endif
 
 objs-pthread-libc:
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
 	$(MAKE) -C nptl $@
 else
 	touch $(PTCOBJST) $(PTCOBJSH)
@@ -105,7 +105,7 @@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 shared: all
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
 	$(LD) $(LDFLAGS_NOSTRIP) -soname=$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) \
 		-o $(LIBPTHREAD_SHARED_FULLNAME) $(SHARED_START_FILES) --whole-archive $(LIBPTHREAD_SHARED_ARCHIVE) \
 		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \

More information about the uClibc-cvs mailing list