This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[BZ#14767] Remove tests for have-initfini-array in elf/Makefile
- From: Andreas Jaeger <aj at suse dot com>
- To: libc-alpha <libc-alpha at sourceware dot org>
- Date: Sat, 27 Oct 2012 15:08:00 +0200
- Subject: [BZ#14767] Remove tests for have-initfini-array in elf/Makefile
have-initfini-array has been removed in commit ce33ee7, here's a patch
to remove the last usage.
With the patch, the testsuite now fails:
tst-array1.c:89:14: error: fini_array causes a section type conflict
tst-array1.c:63:14: error: init_array causes a section type conflict
make[2]: *** [/home/aj/build/glibc/testing/elf/tst-array1.o] Error 1
Any hints on what goes wrong here?
Andreas
2012-10-27 Andreas Jaeger <aj@suse.de>
[BZ#14767]
* 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.
diff --git a/elf/Makefile b/elf/Makefile
index f539f13..d583b94 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
--
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126