瀏覽代碼

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>
Carmelo Amoroso 14 年之前
父節點
當前提交
72b7786ff1
共有 4 個文件被更改,包括 11 次插入2 次删除
  1. 1 0
      test/nptl/Makefile
  2. 3 0
      test/nptl/Makefile.in
  3. 2 1
      test/tls/Makefile
  4. 5 1
      test/tls/Makefile.in

+ 1 - 0
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

+ 3 - 0
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				\

+ 2 - 1
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

+ 5 - 1
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			\