diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-04 00:29:14 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-04 00:29:14 +0000 |
| commit | 8c7ac6fc362d2d958c97262032c7dbde3471b100 (patch) | |
| tree | e809e1f42e7b9059aaec495db5be4c90c119157e /libpthread | |
| parent | 30ad5a705dad5ac4ccae99cbd00c1a05863de4de (diff) | |
Clean up pthread include mess. Some of these will be needed to support NPTL, but they do no harm for the linuxthreads case. Yes, I tested this.
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/linuxthreads/Makefile | 12 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile | 9 |
2 files changed, 5 insertions, 16 deletions
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile index 4072d660f..d5637eccf 100644 --- a/libpthread/linuxthreads/Makefile +++ b/libpthread/linuxthreads/Makefile @@ -22,17 +22,11 @@ include $(TOPDIR)Rules.mak CFLAGS+=$(SSP_ALL_CFLAGS) -#This stuff will not compile without at least -O1 +# This stuff will not compile without at least -O1 CFLAGS :=$(CFLAGS:-O0=-O1) -# set up system dependencies include dirs (NOTE: order matters!) -# psm: don't think that the last include makes sense -# they all should be already linked to $(TOPDIR)include -PTDIR = $(TOPDIR)libpthread/linuxthreads/ -SYSDEPINC = -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ - -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH) -CFLAGS += $(SYSDEPINC) +# Get the thread include dependencies +CFLAGS += $(PTINC) ARCH_CFLAGS = $(CFLAGS) diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile index 2c27cdccc..3c7ee91a7 100644 --- a/libpthread/linuxthreads_db/Makefile +++ b/libpthread/linuxthreads_db/Makefile @@ -26,13 +26,8 @@ AR_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).a SO_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).so SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so -# set up system dependencies include dirs (NOTE: order matters!) -PTDIR = $(TOPDIR)libpthread/linuxthreads/ -SYSDEPINC = -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ - -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH) - -CFLAGS += $(SYSDEPINC) -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" +# Get the thread include dependencies and shared object name +CFLAGS += $(PTINC) -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" # Remove any -z defs since this lib will have undefined symbols LDFLAGS := $(subst -z defs,,$(LDFLAGS)) --warn-unresolved-symbols |