From: Andreas Schwab <schwab@redhat.com>
Date: Thu, 4 Aug 2011 15:29:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release/2.13/master' into fedora/2.13/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29f9830714c25b8aae6fb553390271bce0f202ce;p=thirdparty%2Fglibc.git

Merge remote-tracking branch 'origin/release/2.13/master' into fedora/2.13/master
---

29f9830714c25b8aae6fb553390271bce0f202ce
diff --cc elf/Makefile
index 1708f01f7c7,0f37804aa45..c169df51c14
--- a/elf/Makefile
+++ b/elf/Makefile
@@@ -197,10 -198,11 +200,11 @@@ tests += loadtest restest1 preloadtest 
  	 tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
  	 tst-dlmodcount tst-dlopenrpath tst-deep1 \
  	 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
 -	 unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
 +	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
  	 tst-audit1 tst-audit2 \
  	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2
+ 	 tst-unique1 tst-unique2 \
+ 	 tst-initorder
  #	 reldep9
  test-srcs = tst-pathopt
  tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
@@@ -250,10 -252,12 +254,13 @@@ modules-names = testobj1 testobj2 testo
  		unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
  		unload6mod1 unload6mod2 unload6mod3 \
  		unload7mod1 unload7mod2 \
 +		unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
  		order2mod1 order2mod2 order2mod3 order2mod4 \
  		tst-unique1mod1 tst-unique1mod2 \
- 		tst-unique2mod1 tst-unique2mod2
+ 		tst-unique2mod1 tst-unique2mod2 \
+ 		tst-initordera1 tst-initorderb1 \
+ 		tst-initordera2 tst-initorderb2 \
+ 		tst-initordera3 tst-initordera4
  ifeq (yes,$(have-initfini-array))
  modules-names += tst-array2dep tst-array5dep
  endif
@@@ -534,9 -538,11 +541,14 @@@ $(objpfx)unload6mod2.so: $(libdl
  $(objpfx)unload6mod3.so: $(libdl)
  $(objpfx)unload7mod1.so: $(libdl)
  $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
 +$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
 +$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
 +$(objpfx)unload8mod3.so: $(libdl)
+ $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
+ $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
+ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
+ $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so
+ $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so
  
  LDFLAGS-tst-tlsmod5.so = -nostdlib
  LDFLAGS-tst-tlsmod6.so = -nostdlib