From 41537a770b46f2376e74af58ba4885749339e81e Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 15 Sep 2014 22:13:07 +0200 Subject: buildsys: fix IS_IN_lib* define NOT_IN_libc / IS_IN_libxxx appropriately to fix pthread_once Signed-off-by: Bernhard Reutner-Fischer --- libpthread/linuxthreads.old/Makefile.in | 4 +--- libpthread/linuxthreads.old_db/Makefile.in | 2 +- libpthread/linuxthreads/Makefile.in | 6 +----- libpthread/linuxthreads_db/Makefile.in | 2 +- libpthread/nptl/Makefile.in | 11 +++++----- libpthread/nptl/sysdeps/metag/Makefile.arch | 2 -- libpthread/nptl/sysdeps/pthread/Makefile.in | 4 ++-- .../sysdeps/unix/sysv/linux/Makefile.commonarch | 8 -------- .../sysdeps/unix/sysv/linux/i386/Makefile.arch | 13 +++++------- .../sysdeps/unix/sysv/linux/mips/Makefile.arch | 2 -- .../sysdeps/unix/sysv/linux/powerpc/Makefile.arch | 7 ++----- .../nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch | 24 +++------------------- .../sysdeps/unix/sysv/linux/sparc/Makefile.arch | 4 +--- .../sysdeps/unix/sysv/linux/x86_64/Makefile.arch | 14 ++++--------- libpthread/nptl_db/Makefile.in | 8 +++++--- 15 files changed, 32 insertions(+), 79 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index 48b273e7a..6be2099d2 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -9,9 +9,7 @@ subdirs += libpthread/linuxthreads.old CFLAGS-dir_linuxthreads.old := -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-linuxthreads.old := $(CFLAGS-dir_linuxthreads.old) $(SSP_ALL_CFLAGS) - -CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old) +CFLAGS-libpthread/linuxthreads.old := $(CFLAGS-dir_linuxthreads.old) $(SSP_ALL_CFLAGS) ifeq ($(PTHREADS_DEBUG_SUPPORT),y) LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in index 8741eab7c..cf0ceb394 100644 --- a/libpthread/linuxthreads.old_db/Makefile.in +++ b/libpthread/linuxthreads.old_db/Makefile.in @@ -8,7 +8,7 @@ subdirs += libpthread/linuxthreads.old_db # Get the thread include dependencies and shared object name -CFLAGS-linuxthreads.old_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" +CFLAGS-libpthread/linuxthreads.old_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols) ifeq ($(DOSTRIP),y) diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 697371b08..4a499f78e 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -11,11 +11,7 @@ subdirs += libpthread/linuxthreads/sysdeps/unix/sysv/linux subdirs += libpthread/linuxthreads/sysdeps/pthread CFLAGS-dir_linuxthreads := -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-linuxthreads := $(CFLAGS-dir_linuxthreads) $(SSP_ALL_CFLAGS) - -CFLAGS-libpthread/linuxthreads/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads) -CFLAGS-libpthread/linuxthreads/sysdeps/unix/sysv/linux/ := $(CFLAGS-linuxthreads) -CFLAGS-libpthread/linuxthreads/sysdeps/pthread/ := $(CFLAGS-linuxthreads) +CFLAGS-libpthread/linuxthreads := $(CFLAGS-dir_linuxthreads) $(SSP_ALL_CFLAGS) # This stuff will not compile without at least -O1 # psm: can't handle this here, could maybe search for -O0 in CFLAGS diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index 060bea3a3..52cc7c838 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -8,7 +8,7 @@ subdirs += libpthread/linuxthreads_db # Get the thread include dependencies and shared object name -CFLAGS-linuxthreads_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" +CFLAGS-libpthread/linuxthreads_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols) ifeq ($(DOSTRIP),y) diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index c619f982c..cdf07cf45 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -141,7 +141,8 @@ LDFLAGS-libpthread.so += $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so $( LIBS-libpthread.so := $(LIBS) -CFLAGS-nptl = -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS) +CFLAGS-dir_nptl := -DNOT_IN_libc -DIS_IN_libpthread +CFLAGS-libpthread/nptl := $(CFLAGS-dir_nptl) $(SSP_ALL_CFLAGS) # Since cancellation handling is in large parts handled using exceptions # we have to compile some files with exception handling enabled, some @@ -212,7 +213,7 @@ CFLAGS-pthread_barrierattr_getpshared.c = -D_GNU_SOURCE CFLAGS-pthread_barrierattr_setpshared.c = -D_GNU_SOURCE CFLAGS-sem_open.c = -D_GNU_SOURCE -CFLAGS-OMIT-alloca_cutoff.c = $(CFLAGS-nptl) -CFLAGS-OMIT-forward.c = $(CFLAGS-nptl) -CFLAGS-OMIT-libc-lowlevelock.c = $(CFLAGS-nptl) -CFLAGS-OMIT-libc-cancellation.c = $(CFLAGS-nptl) +CFLAGS-OMIT-alloca_cutoff.c = $(CFLAGS-dir_nptl) +CFLAGS-OMIT-forward.c = $(CFLAGS-dir_nptl) +CFLAGS-OMIT-libc-lowlevelock.c = $(CFLAGS-dir_nptl) +CFLAGS-OMIT-libc-cancellation.c = $(CFLAGS-dir_nptl) diff --git a/libpthread/nptl/sysdeps/metag/Makefile.arch b/libpthread/nptl/sysdeps/metag/Makefile.arch index 0a42e686a..bc19f6b22 100644 --- a/libpthread/nptl/sysdeps/metag/Makefile.arch +++ b/libpthread/nptl/sysdeps/metag/Makefile.arch @@ -12,6 +12,4 @@ ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE -CFLAGS-metag = $(SSP_ALL_CFLAGS) - libc_arch_a_CSRC := libc-tls.c diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in index add3a8e5f..84adfe0c6 100644 --- a/libpthread/nptl/sysdeps/pthread/Makefile.in +++ b/libpthread/nptl/sysdeps/pthread/Makefile.in @@ -34,7 +34,7 @@ libpthread_pthread_CSRC = \ pthread_spin_unlock.c \ pt-longjmp.c \ tpp.c -CFLAGS-pthread = $(SSP_ALL_CFLAGS) -DNOT_IN_libc -DIS_IN_libpthread + CFLAGS-pthread_barrier_wait.c = -D_GNU_SOURCE CFLAGS-pthread_spin_destroy.c = -D_GNU_SOURCE CFLAGS-pthread_spin_init.c = -D_GNU_SOURCE @@ -54,7 +54,7 @@ librt-pt-routines-y = librt-cancellation.c librt-pt-shared-only-routines-y = rt-unwind-resume.c ifeq ($(UCLIBC_CTOR_DTOR),y) -CFLAGS-OMIT-pt-initfini.c = $(CFLAGS-pthread) +CFLAGS-OMIT-pt-initfini.c = $(CFLAGS-y-libpthread/nptl/sysdeps/pthread) CFLAGS-pt-initfini.c = -S -g0 $(PICFLAG) -fno-inline-functions \ $(call check_gcc,-fno-unit-at-a-time,) \ $(SSP_DISABLE_FLAGS) \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch index a63e3fd66..1fa3045c7 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch @@ -134,8 +134,6 @@ ifneq ($(UCLIBC_HAS_BACKTRACE),) CFLAGS-raise.c = -fasynchronous-unwind-tables endif -CFLAGS-linux = -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS) - CFLAGS-OMIT-libc_pthread_init.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-OMIT-libc_multiple_threads.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-OMIT-register-atfork.c = -DNOT_IN_libc -DIS_IN_libpthread @@ -160,12 +158,6 @@ CFLAGS-OMIT-timer_gettime.c = -DIS_IN_libpthread CFLAGS-OMIT-timer_routines.c = -DIS_IN_libpthread CFLAGS-OMIT-timer_settime.c = -DIS_IN_libpthread -#ASFLAGS-open.S = -D_LIBC_REENTRANT -#ASFLAGS-close.S = -D_LIBC_REENTRANT -#ASFLAGS-read.S = -D_LIBC_REENTRANT -#ASFLAGS-write.S = -D_LIBC_REENTRANT -#ASFLAGS-waitpid.S = -D_LIBC_REENTRANT - PTHREAD_LINUX_SYM := $(notdir $(wildcard $(libpthread_linux_DIR)/*.sym)) PTHREAD_LINUX_SYM_H := $(addprefix $(libpthread_linux_OUT)/,$(PTHREAD_LINUX_SYM:.sym=.h)) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch index 9a34595f1..3f5c33d0a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch @@ -14,15 +14,12 @@ libc_linux_arch_SSRC = clone.S vfork.S ASFLAGS += -DUSE___THREAD CFLAGS-pt-__syscall_error.c = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-lowlevelrobustlock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-pthread_once.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-pthread_spin_unlock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT +ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-lowlevelrobustlock.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-pthread_once.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-pthread_spin_unlock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-clone.S = -D_LIBC_REENTRANT -ASFLAGS-vfork.S = -D_LIBC_REENTRANT -ASFLAGS-libc-lowlevellock.S = -D_LIBC_REENTRANT ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch index fc26a8e13..afae6cd56 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch @@ -23,5 +23,3 @@ CFLAGS-pthread_once.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pt-__syscall_rt_sigaction.c = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-clone.S = -D_LIBC_REENTRANT -ASFLAGS-vfork.S = -D_LIBC_REENTRANT diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch index 8581aea6f..23c0210d5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch @@ -19,12 +19,9 @@ ASFLAGS += -DUSE___THREAD CFLAGS-pthread_once.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pt-__syscall_error.c = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -#ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT +ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread +#ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread -#ASFLAGS-libc-lowlevellock.S = -D_LIBC_REENTRANT -ASFLAGS-clone.S = -D_LIBC_REENTRANT -ASFLAGS-vfork.S = -D_LIBC_REENTRANT ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch index a8249e0f4..fa1a365ea 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch @@ -17,30 +17,12 @@ libc_linux_arch_SSRC = libc-lowlevellock.S clone.S vfork.S ASFLAGS += -DUSE___THREAD -ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-pthread_once.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_rwlock_wrlock.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_rwlock_rdlock.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_rwlock_unlock.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_barrier_wait.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_cond_broadcast.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_cond_signal.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_cond_wait.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_cond_timedwait.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_rwlock_timedwrlock.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_rwlock_timedrdlock.S = -D_LIBC_REENTRANT -ASFLAGS-sem_post.S = -D_LIBC_REENTRANT -ASFLAGS-sem_timedwait.S = -D_LIBC_REENTRANT -ASFLAGS-sem_trywait.S = -D_LIBC_REENTRANT -ASFLAGS-sem_wait.S = -D_LIBC_REENTRANT +ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-libc-lowlevellock.S = -D_LIBC_REENTRANT -ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-lowlevelrobustlock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT +ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-lowlevelrobustlock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-clone.S = -D_LIBC_REENTRANT -ASFLAGS-vfork.S = -D_LIBC_REENTRANT ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch index 102c0dad1..978f3c748 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch @@ -17,13 +17,11 @@ librt_linux_arch_CSRC = pt-__syscall_error.c ASFLAGS += -DUSE___THREAD -ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT +ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pthread_once.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pt-__syscall_error.c = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-clone.S = -D_LIBC_REENTRANT -ASFLAGS-vfork.S = -D_LIBC_REENTRANT ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch index 71df9861d..abc48e9e9 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch @@ -21,17 +21,11 @@ librt_linux_arch_SSRC = librt-cancellation.S ASFLAGS += -DUSE___THREAD CFLAGS-pt-__syscall_error.c = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-pthread_once.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-cancellation.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT -ASFLAGS-pthread_cond_timedwait.S = -D_LIBC_REENTRANT -ASFLAGS-pthread_cond_wait.S = -D_LIBC_REENTRANT +ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-pthread_once.S = -DNOT_IN_libc -DIS_IN_libpthread +ASFLAGS-cancellation.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-clone.S = -D_LIBC_REENTRANT -ASFLAGS-vfork.S = -D_LIBC_REENTRANT -ASFLAGS-libc-lowlevellock.S = -D_LIBC_REENTRANT -ASFLAGS-libc-cancellation.S = -D_LIBC_REENTRANT ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ endif diff --git a/libpthread/nptl_db/Makefile.in b/libpthread/nptl_db/Makefile.in index b1585299a..76102e65f 100644 --- a/libpthread/nptl_db/Makefile.in +++ b/libpthread/nptl_db/Makefile.in @@ -8,9 +8,11 @@ subdirs += libpthread/nptl_db # Get the thread include dependencies and shared object name -CFLAGS-nptl_db := -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" -CFLAGS-nptl_db += -I$(top_srcdir)libpthread/nptl -D_GNU_SOURCE -CFLAGS-nptl_db += -DIS_IN_libthread_db=1 -DNOT_IN_libc -std=gnu99 -I$(top_srcdir)ldso/include +CFLAGS-libpthread/nptl_db := -DNOT_IN_libc \ + -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" \ + -std=gnu99 -D_GNU_SOURCE \ + -I$(top_srcdir)libpthread/nptl \ + -I$(top_srcdir)ldso/include LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols) LIBS-libthread_db.so := $(LIBS) -- cgit v1.2.3