diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-06 04:07:21 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-06 04:07:21 +0000 |
| commit | c237bf341806759207379e5958a65c26f3cc3970 (patch) | |
| tree | b0c6ffb1d179c25260245549624194f9bd8b8c2e /Rules.mak | |
| parent | 29a33929c807d5c9b5b5092716c871ceb2fae8a1 (diff) | |
| download | uClibc-alpine-c237bf341806759207379e5958a65c26f3cc3970.tar.bz2 uClibc-alpine-c237bf341806759207379e5958a65c26f3cc3970.tar.xz | |
Sync with trunk.
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 33 |
1 files changed, 20 insertions, 13 deletions
@@ -304,20 +304,22 @@ else endif ifeq ($(UCLIBC_HAS_THREADS),y) +ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y) + PTNAME := nptl +else + PTNAME := linuxthreads +endif +PTDIR := $(TOPDIR)libpthread/$(PTNAME)/ # set up system dependencies include dirs (NOTE: order matters!) -PTDIR := $(TOPDIR)libpthread/linuxthreads/ -PTINC := -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) -ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -PTDIR := $(TOPDIR)libpthread/nptl/ -PTINC := -I$(PTDIR)compat \ - -I$(PTDIR)sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)sysdeps/unix/sysv/linux \ - -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/pthread/bits \ - -I$(PTDIR)sysdeps/generic \ - -include $(PTDIR)compat/libc-symbols.h +ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y) +PTINC := -I$(PTDIR)compat \ + -I$(PTDIR)sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ + -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ + -I$(PTDIR)sysdeps/unix/sysv/linux \ + -I$(PTDIR)sysdeps/pthread \ + -I$(PTDIR)sysdeps/pthread/bits \ + -I$(PTDIR)sysdeps/generic \ + -include $(PTDIR)compat/libc-symbols.h # # Test for TLS if NPTL support was selected. # @@ -335,6 +337,11 @@ gcc_tls_test_fail: @echo "####"; @exit 1; endif +else +# psm: the next 2 are probably incorrect, the generic header will +# win over the arch specific one +PTINC := -I$(PTDIR)sysdeps/pthread \ + -I$(PTDIR)sysdeps/$(TARGET_ARCH) endif endif |