about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-08-04 11:47:08 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-08-04 11:47:23 -0700
commit3093fd5e5d418b91411aa9b061850b8773433cf7 (patch)
tree9500b921620218982b920a280e42c0a3f44ce9a1
parentd2cf37c0a2a375cf2fde69f1afbcc49e45368fc4 (diff)
downloadglibc-3093fd5e5d418b91411aa9b061850b8773433cf7.tar.gz
glibc-3093fd5e5d418b91411aa9b061850b8773433cf7.tar.xz
glibc-3093fd5e5d418b91411aa9b061850b8773433cf7.zip
Run vismain only if linker supports protected data symbol
Gold doesn't support protected data symbol:

configure:5672: checking linker support for protected data symbol
configure:5682: gcc -fuse-ld=gold -nostdlib -nostartfiles -fno-stack-protector -fPIC -shared conftest.c -o conftest.so
configure:5685: $? = 0
configure:5692: gcc -fuse-ld=gold -nostdlib -nostartfiles -fno-stack-protector conftest.c -o conftest conftest.so
/usr/local/bin/ld.gold: error: /tmp/ccXWoofs.o: cannot make copy relocation for protected symbol 'bar', defined in conftest.so
collect2: error: ld returned 1 exit status

Run vismain only if linker supports protected data symbol.

	* elf/Makefile (tests): Add vismain only if
	$(have-protected-data) == yes.
	(tests-pie): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--elf/Makefile2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 613db927a3..33caac763c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-08-04  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* elf/Makefile (tests): Add vismain only if
+	$(have-protected-data) == yes.
+	(tests-pie): Likewise.
+
+2017-08-04  H.J. Lu  <hongjiu.lu@intel.com>
+
 	[BZ #21871]
 	* sysdeps/x86/cpu-features.c (init_cpu_features): Set
 	bit_arch_Use_dl_runtime_resolve_opt only with AVX512F.
diff --git a/elf/Makefile b/elf/Makefile
index e758a4c960..2956445de8 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -289,10 +289,12 @@ ifeq (yesyes,$(have-fpie)$(build-shared))
 modules-names += tst-piemod1
 tests += tst-pie1 tst-pie2
 tests-pie += tst-pie1 tst-pie2
+ifeq (yes,$(have-protected-data))
 tests += vismain
 tests-pie += vismain
 CFLAGS-vismain.c = $(PIE-ccflag)
 endif
+endif
 modules-execstack-yes = tst-execstack-mod
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))