summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-01-07 15:05:27 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-02-09 07:55:19 +0100
commit72b7786ff14504eea9a16c738216aed549f7f1cc (patch)
treee793d1014bcd43524e91f7ad9a82d57d80b7f293
parent828ba271af0e7a61154740646014c5b1d81d8fb9 (diff)
nptl_test: sysdep headers re-factoring
Update nptl and tls Makefiles according to new sysdep headers structure Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-rw-r--r--test/nptl/Makefile1
-rw-r--r--test/nptl/Makefile.in3
-rw-r--r--test/tls/Makefile3
-rw-r--r--test/tls/Makefile.in6
4 files changed, 11 insertions, 2 deletions
diff --git a/test/nptl/Makefile b/test/nptl/Makefile
index a99c5d16f..c22b635b7 100644
--- a/test/nptl/Makefile
+++ b/test/nptl/Makefile
@@ -2,6 +2,7 @@
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
top_builddir=../../
+top_srcdir=../../
include ../Rules.mak
-include Makefile.in
include ../Test.mak
diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
index 0bca63b78..b8e140bc1 100644
--- a/test/nptl/Makefile.in
+++ b/test/nptl/Makefile.in
@@ -58,8 +58,11 @@ GLIBC_TESTS_DISABLED += tst-tls3_glibc tst-tls4_glibc tst-tls5_glibc
endif
PTDIR := $(top_builddir)libpthread/nptl
+SYSDEPS_DIR := $(top_srcdir)libc/sysdeps
EXTRA_CFLAGS := -DNOT_IN_libc=1 -D_LIBC -D__USE_GNU -std=gnu99 \
+ -I$(SYSDEPS_DIR)/linux \
+ -I$(SYSDEPS_DIR)/linux/$(TARGET_ARCH) \
-I$(PTDIR) -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \
-I$(PTDIR)/sysdeps/$(TARGET_ARCH) \
-I$(PTDIR)/sysdeps/unix/sysv/linux \
diff --git a/test/tls/Makefile b/test/tls/Makefile
index a99c5d16f..607fec2c9 100644
--- a/test/tls/Makefile
+++ b/test/tls/Makefile
@@ -1,7 +1,8 @@
-# uClibc NPTL tests
+# uClibc TLS tests
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
top_builddir=../../
+top_srcdir=../../
include ../Rules.mak
-include Makefile.in
include ../Test.mak
diff --git a/test/tls/Makefile.in b/test/tls/Makefile.in
index 839824df1..d19d347f3 100644
--- a/test/tls/Makefile.in
+++ b/test/tls/Makefile.in
@@ -18,9 +18,13 @@ GLIBC_TESTS_DISABLED := $(addsuffix _glibc,$(filter-out $(TESTS_DISABLED),$(TEST
PTDIR := $(top_builddir)libpthread/nptl
+SYSDEPS_DIR := $(top_srcdir)libc/sysdeps
EXTRA_CFLAGS := -DNOT_IN_libc=1 \
- -std=gnu99 -I. -I$(PTDIR) \
+ -std=gnu99 -I. \
+ -I$(SYSDEPS_DIR)/linux \
+ -I$(SYSDEPS_DIR)/linux/$(TARGET_ARCH) \
+ -I$(PTDIR) \
-I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \
-I$(PTDIR)/sysdeps/$(TARGET_ARCH) \
-I$(PTDIR)/sysdeps/unix/sysv/linux \