about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-10-30 09:07:01 +0100
committerAndreas Jaeger <aj@suse.de>2012-10-30 09:07:01 +0100
commite5088dc6870b072a263f207af9e410c82f80a09e (patch)
treef9d1a6656afb4f8c3265cd8f0f8f7f70a286e350
parente717036357a703f9166abec29d73245a1c4ccbb4 (diff)
downloadglibc-e5088dc6870b072a263f207af9e410c82f80a09e.tar.gz
glibc-e5088dc6870b072a263f207af9e410c82f80a09e.tar.xz
glibc-e5088dc6870b072a263f207af9e410c82f80a09e.zip
[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.
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--elf/Makefile17
3 files changed, 13 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 88bb8736b5..29d0a9a487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-10-30  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.
+
 	* po/eo.po: Add Esperanto translation from translation project.
 
 	* elf/tst-array1.c (fini_array): Make writeable so that it can be
diff --git a/NEWS b/NEWS
index a1cc1287fd..d548217462 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ Version 2.17
   14477, 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543,
   14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14602,
   14621, 14638, 14645, 14648, 14652, 14660, 14661, 14683, 14694, 14716,
-  14743.
+  14743, 14767.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
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