summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2006-02-05 05:05:53 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2006-02-05 05:05:53 +0000
commit2992466eb586db5728301219c365193559636439 (patch)
tree74d74efc4cc8813ce19a7af7ef1b62e0b5f9c3a5
parent18540edf4d9d4f5fc0075669d551938f8c7acd9d (diff)
downloaduClibc-alpine-2992466eb586db5728301219c365193559636439.tar.bz2
uClibc-alpine-2992466eb586db5728301219c365193559636439.tar.xz
Remove remaining usage of the NPTL 'compat' compatiblity files directory. Hooray.
-rw-r--r--Rules.mak5
-rw-r--r--libpthread/nptl/sysdeps/pthread/defs.awk2
-rw-r--r--test/tls/Makefile2
3 files changed, 2 insertions, 7 deletions
diff --git a/Rules.mak b/Rules.mak
index 2b06ed8ec..ad36d6749 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -368,7 +368,6 @@ PTDIR := $(top_builddir)libpthread/$(PTNAME)
# set up system dependencies include dirs (NOTE: order matters!)
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
PTINC:= -I$(PTDIR) \
- -I$(PTDIR)/compat \
-I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \
-I$(PTDIR)/sysdeps/$(TARGET_ARCH) \
-I$(PTDIR)/sysdeps/unix/sysv/linux \
@@ -376,8 +375,8 @@ PTINC:= -I$(PTDIR) \
-I$(PTDIR)/sysdeps/pthread/bits \
-I$(PTDIR)/sysdeps/generic \
-I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
- -I$(top_srcdir)ldso/include \
- -include $(PTDIR)/compat/libc-symbols.h
+ -I$(top_srcdir)ldso/include
+
#
# Test for TLS if NPTL support was selected.
#
diff --git a/libpthread/nptl/sysdeps/pthread/defs.awk b/libpthread/nptl/sysdeps/pthread/defs.awk
index 763c2e57d..d41d57bd7 100644
--- a/libpthread/nptl/sysdeps/pthread/defs.awk
+++ b/libpthread/nptl/sysdeps/pthread/defs.awk
@@ -21,6 +21,4 @@ END {
print "#define ALIGN .align", max;
else
print "#define ALIGN";
-
- print "#include <libc-symbols.h>";
}
diff --git a/test/tls/Makefile b/test/tls/Makefile
index 0d2d64f12..5a9bcc39f 100644
--- a/test/tls/Makefile
+++ b/test/tls/Makefile
@@ -22,14 +22,12 @@ include ../Rules.mak
INCLUDES := -I. -I$(TOPDIR)include \
-I$(PTDIR) \
- -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 \
-I$(TOPDIR)ldso/include \
-I$(TOPDIR)ldso/ldso/$(TARGET_ARCH)