about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-26 03:04:07 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-26 03:04:07 -0400
commit68468076c221dc595e955d2c7982a3391ee0772a (patch)
tree6e9d11d83a261bc2f22e1d25aca25a91a7e4e2de
parentacb0d739c5801d3a27122d6aafdd282327c3996f (diff)
downloadglibc-68468076c221dc595e955d2c7982a3391ee0772a.tar.gz
glibc-68468076c221dc595e955d2c7982a3391ee0772a.tar.xz
glibc-68468076c221dc595e955d2c7982a3391ee0772a.zip
We don't use linkobj/libc.so at runtmie, no need to check for text rels
This also works around a toolchain issu.
-rw-r--r--ChangeLog4
-rw-r--r--elf/Makefile5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 390928f063..0745a7dd80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-26  Ulrich Drepper  <drepper@gmail.com>
+
+	* elf/Makefile (all-built-dso): No need to check linkobj/libc.so.
+
 2011-06-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/i686/multiarch/strcpy-sse2.S (RETURN): Fix a typo.
diff --git a/elf/Makefile b/elf/Makefile
index 5c057387ed..fbd7d88c06 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -973,8 +973,9 @@ ifeq (yes,$(build-shared))
 tests: $(objpfx)check-textrel.out $(objpfx)check-execstack.out
 
 all-built-dso = $(common-objpfx)libc.so \
-		$(sort $(wildcard $(common-objpfx)*/lib*.so \
-				  $(common-objpfx)iconvdata/*.so))
+		$(filter-out $(common-objpfx)linkobj/libc.so, \
+			     $(sort $(wildcard $(common-objpfx)*/lib*.so \
+					       $(common-objpfx)iconvdata/*.so)))
 
 $(objpfx)check-textrel.out: $(objpfx)check-textrel $(all-built-dso)
 	$(dir $<)$(notdir $<) $(filter-out $<, $^) > $@