From e5088dc6870b072a263f207af9e410c82f80a09e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 30 Oct 2012 09:07:01 +0100 Subject: [BZ#14767] Remove tests for have-initfini-array in elf/Makefile * elf/Makefile (tests): Remove conditional for have-initfini-array since this is now always required and the variable does not exist anymore. (tests-static): Likewise. (modules-names): Likewise. --- elf/Makefile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index f539f13756..d583b94012 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -115,20 +115,15 @@ $(inst_auditdir)/sotruss-lib.so: $(objpfx)sotruss-lib.so $(+force) $(do-install-program) endif -tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 -ifeq (yes,$(have-initfini-array)) -tests += tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 -endif +tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \ + tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \ - tst-leaks1-static + tst-leaks1-static tst-array1-static tst-array5-static ifeq (yes,$(build-shared)) tests-static += tst-tls9-static tst-tls9-static-ENV = \ LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn endif -ifeq (yes,$(have-initfini-array)) -tests-static += tst-array1-static tst-array5-static -endif tests += $(tests-static) ifeq (yes,$(build-shared)) tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ @@ -215,10 +210,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-initordera3 tst-initordera4 \ tst-initorder2a tst-initorder2b tst-initorder2c \ tst-initorder2d \ - tst-relsort1mod1 tst-relsort1mod2 -ifeq (yes,$(have-initfini-array)) -modules-names += tst-array2dep tst-array5dep -endif + tst-relsort1mod1 tst-relsort1mod2 tst-array2dep \ + tst-array5dep ifeq (yesyes,$(have-fpie)$(build-shared)) modules-names += tst-piemod1 tests += tst-pie1 -- cgit 1.4.1