From 95acdd4b30d856f46e3dd908a934eaeb68c9b572 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 16 Sep 2014 22:07:12 +0200 Subject: buildsys: remove now redundant lib placement defines Signed-off-by: Bernhard Reutner-Fischer --- libpthread/nptl/sysdeps/arc/Makefile.arch | 5 --- libpthread/nptl/sysdeps/arm/Makefile.arch | 7 ---- libpthread/nptl/sysdeps/metag/Makefile.arch | 5 --- libpthread/nptl/sysdeps/mips/Makefile.arch | 8 +---- libpthread/nptl/sysdeps/sh/Makefile.arch | 3 -- .../sysdeps/unix/sysv/linux/Makefile.commonarch | 38 ++++------------------ .../nptl/sysdeps/unix/sysv/linux/arc/Makefile.arch | 17 ---------- .../nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch | 12 ------- .../sysdeps/unix/sysv/linux/i386/Makefile.arch | 11 ------- .../sysdeps/unix/sysv/linux/metag/Makefile.arch | 13 -------- .../sysdeps/unix/sysv/linux/mips/Makefile.arch | 8 ----- .../sysdeps/unix/sysv/linux/powerpc/Makefile.arch | 9 ----- .../nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch | 9 ----- .../sysdeps/unix/sysv/linux/sparc/Makefile.arch | 10 ------ .../sysdeps/unix/sysv/linux/x86_64/Makefile.arch | 10 ------ 15 files changed, 8 insertions(+), 157 deletions(-) (limited to 'libpthread') diff --git a/libpthread/nptl/sysdeps/arc/Makefile.arch b/libpthread/nptl/sysdeps/arc/Makefile.arch index 1c728847e..08ec7e7d9 100644 --- a/libpthread/nptl/sysdeps/arc/Makefile.arch +++ b/libpthread/nptl/sysdeps/arc/Makefile.arch @@ -5,9 +5,4 @@ # Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. # -CFLAGS-pt-raise.c = -DNOT_IN_libc -DIS_IN_libpthread - -ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread - libc_arch_a_CSRC = libc-tls.c diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch index fbe497583..62a2822df 100644 --- a/libpthread/nptl/sysdeps/arm/Makefile.arch +++ b/libpthread/nptl/sysdeps/arm/Makefile.arch @@ -7,11 +7,4 @@ # librt_arch_SSRC = aeabi_read_tp.S thumb_atomics.S - -CFLAGS-pt-raise.c = -DNOT_IN_libc -DIS_IN_libpthread - -ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-aeabi_read_tp.S = -DNOT_IN_libc=1 - libc_arch_a_CSRC = libc-tls.c diff --git a/libpthread/nptl/sysdeps/metag/Makefile.arch b/libpthread/nptl/sysdeps/metag/Makefile.arch index bc19f6b22..ed5b52c5e 100644 --- a/libpthread/nptl/sysdeps/metag/Makefile.arch +++ b/libpthread/nptl/sysdeps/metag/Makefile.arch @@ -5,11 +5,6 @@ # Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. # -CFLAGS-pthread_spin_init.c = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_unlock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread - ASFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE libc_arch_a_CSRC := libc-tls.c diff --git a/libpthread/nptl/sysdeps/mips/Makefile.arch b/libpthread/nptl/sysdeps/mips/Makefile.arch index 2762a2fe0..10f8abf3b 100644 --- a/libpthread/nptl/sysdeps/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/mips/Makefile.arch @@ -5,13 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CFLAGS-pt-raise.c = -DNOT_IN_libc -DIS_IN_libpthread - -ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-nptl-sysdep.S = -DNOT_IN_libc -DIS_IN_libpthread \ - -D_LIBC_REENTRANT \ - -I$(top_srcdir)libc/sysdeps/linux/mips +ASFLAGS-nptl-sysdep.S = -I$(top_srcdir)libc/sysdeps/linux/mips libc_arch_a_CSRC = libc-tls.c diff --git a/libpthread/nptl/sysdeps/sh/Makefile.arch b/libpthread/nptl/sysdeps/sh/Makefile.arch index 411622adc..b50dd51e0 100644 --- a/libpthread/nptl/sysdeps/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/sh/Makefile.arch @@ -5,9 +5,6 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -ASFLAGS-pthread_spin_unlock.S = -DNOT_IN_libc -DIS_IN_libpthread -ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread - CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE libc_arch_a_CSRC := libc-tls.c diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch index 1fa3045c7..e4a5fc55d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch @@ -122,42 +122,18 @@ headers_clean-y += HEADERCLEAN_libpthread/nptl/sysdeps/unix/sysv/linux CFLAGS-pthread_getcpuclockid.c = -I$(top_srcdir)librt CFLAGS-pt-pread_pwrite.c = -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \ -I$(top_srcdir)libc/sysdeps/linux/common -CFLAGS-mq_notify.c = -I$(top_srcdir)librt -DIS_IN_librt -CFLAGS-timer_create.c = -I$(top_srcdir)librt -DIS_IN_librt -CFLAGS-timer_delete.c = -I$(top_srcdir)librt -DIS_IN_librt -CFLAGS-timer_getoverr.c = -I$(top_srcdir)librt -DIS_IN_librt -CFLAGS-timer_gettime.c = -I$(top_srcdir)librt -DIS_IN_librt -CFLAGS-timer_routines.c = -I$(top_srcdir)librt -DIS_IN_librt -CFLAGS-timer_settime.c = -I$(top_srcdir)librt -DIS_IN_librt +CFLAGS-mq_notify.c = -I$(top_srcdir)librt +CFLAGS-timer_create.c = -I$(top_srcdir)librt +CFLAGS-timer_delete.c = -I$(top_srcdir)librt +CFLAGS-timer_getoverr.c = -I$(top_srcdir)librt +CFLAGS-timer_gettime.c = -I$(top_srcdir)librt +CFLAGS-timer_routines.c = -I$(top_srcdir)librt +CFLAGS-timer_settime.c = -I$(top_srcdir)librt ifneq ($(UCLIBC_HAS_BACKTRACE),) CFLAGS-raise.c = -fasynchronous-unwind-tables endif -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 -CFLAGS-OMIT-unregister-atfork.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-getpid.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-raise.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-sleep.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-jmp-unwind.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-libc-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread - -#CFLAGS-OMIT-close.S = -DNOT_IN_libc -DIS_IN_libpthread -#CFLAGS-OMIT-open.S = -DNOT_IN_libc -DIS_IN_libpthread -#CFLAGS-OMIT-read.S = -DNOT_IN_libc -DIS_IN_libpthread -#CFLAGS-OMIT-write.S = -DNOT_IN_libc -DIS_IN_libpthread -#CFLAGS-OMIT-waitpid.S = -DNOT_IN_libc -DIS_IN_libpthread - -CFLAGS-OMIT-mq_notify.c = -DIS_IN_libpthread -CFLAGS-OMIT-timer_create.c = -DIS_IN_libpthread -CFLAGS-OMIT-timer_delete.c = -DIS_IN_libpthread -CFLAGS-OMIT-timer_getoverr.c = -DIS_IN_libpthread -CFLAGS-OMIT-timer_gettime.c = -DIS_IN_libpthread -CFLAGS-OMIT-timer_routines.c = -DIS_IN_libpthread -CFLAGS-OMIT-timer_settime.c = -DIS_IN_libpthread - 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/arc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/Makefile.arch index 25e6fadbf..8e3c7b0bc 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/Makefile.arch @@ -13,20 +13,3 @@ libc_linux_arch_CSRC = fork.c libc-lowlevellock.c libc_linux_arch_SSRC = clone.S vfork.S libc_linux_arch_SSRC-OMIT = waitpid.S -CFLAGS-pthread_once.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-pt-__syscall_rt_sigaction.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 - -ASFLAGS-vfork.S = -DIS_IN_libc -DNOT_IN_libpthread -ASFLAGS-clone.S = -DIS_IN_libc -DNOT_IN_libpthread - -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-libc-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread -# We always compile it in arm mode because of SAVE_PID macro -# This macro should be alternatively implemented in THUMB -# assembly. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch index 329d8a94e..c8d5d4ab5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch @@ -14,18 +14,6 @@ libc_linux_arch_CSRC = fork.c libc-lowlevellock.c libc_linux_arch_SSRC = clone.S vfork.S libc_linux_arch_SSRC-OMIT = waitpid.S - -CFLAGS-pthread_once.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-pt-__syscall_rt_sigaction.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 -marm - -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-libc-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread # We always compile it in arm mode because of SAVE_PID macro # This macro should be alternatively implemented in THUMB # assembly. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch index 3f5c33d0a..fff0dae89 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch @@ -13,14 +13,3 @@ 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 -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 - -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/metag/Makefile.arch index df9887596..4d02d0c9a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/metag/Makefile.arch @@ -16,16 +16,3 @@ libc_linux_arch_SSRC-OMIT = waitpid.S CFLAGS += $(SSP_ALL_CFLAGS) -CFLAGS-pthread_once.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-pt-__syscall_rt_sigaction.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-vfork.S = -DIS_IN_libc -DNOT_IN_libpthread -ASFLAGS-clone.S = -DIS_IN_libc -DNOT_IN_libpthread -ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread - -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-libc-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch index afae6cd56..4a3d0f248 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch @@ -15,11 +15,3 @@ libc_linux_arch_SSRC-OMIT = waitpid.S endif ASFLAGS += -DUSE___THREAD -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -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 - diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch index 23c0210d5..21b9b7239 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile.arch @@ -16,12 +16,3 @@ librt_linux_arch_CSRC = pt-__syscall_error.c 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 -#ASFLAGS-lowlevellock.S = -DNOT_IN_libc -DIS_IN_libpthread - -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 fa1a365ea..154dd6e66 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch @@ -17,12 +17,3 @@ libc_linux_arch_SSRC = libc-lowlevellock.S clone.S vfork.S ASFLAGS += -DUSE___THREAD -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 - -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 978f3c748..2b2b5f579 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch @@ -17,13 +17,3 @@ librt_linux_arch_CSRC = pt-__syscall_error.c ASFLAGS += -DUSE___THREAD -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 - -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-libc-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread 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 abc48e9e9..ebd506047 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch @@ -20,13 +20,3 @@ 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 -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 - -ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ -endif -CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -- cgit v1.2.3