Fix --enable-new-dtags config support

and testsuite when configured with --enable-new-dtags.

	* ldmain.c (main): Correct setting of link_indo.new_dtags.
	* testsuite/ld-elf/now-3.d: Pass --disable-new-dtags to ld
	* testsuite/ld-elf/now-4.d: Likewise.
	* testsuite/ld-elf/rpath-1.d: Likewise.
	* testsuite/ld-elf/rpath-2.d: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2e63b26bc2acbe0f25c012b76053a5944efddd4a..8a2286260971dfc17e44eb77978ed0cf08679358 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,8 +1,16 @@
+2017-06-05  Alan Modra  <amodra@gmail.com>
+
+       * ldmain.c (main): Correct setting of link_indo.new_dtags.
+       * testsuite/ld-elf/now-3.d: Pass --disable-new-dtags to ld
+       * testsuite/ld-elf/now-4.d: Likewise.
+       * testsuite/ld-elf/rpath-1.d: Likewise.
+       * testsuite/ld-elf/rpath-2.d: Likewise.
+
 2017-06-05  Slava Barinov  <v.barinov@samsung.com>
 
        * configure.ac: Add --enable-new-dtags option.
-       * ldmain.c: Set link_info.new_dtags to 1 if when --enable-new-dtags is
-       switched on.
+       * ldmain.c (main): Set link_info.new_dtags to 1 if when
+       --enable-new-dtags is switched on.
        * configure: Regenerate.
        * config.in: Regenerate.
 

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 045f3231fa235d27fa25533b722e119b561362f3..2b3a59150f0320772e7f1a53bc407561c389d667 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -299,7 +299,7 @@ main (int argc, char **argv)
   link_info.compress_debug = COMPRESS_DEBUG_GABI_ZLIB;
 #endif
 #ifdef DEFAULT_NEW_DTAGS
-  link_info.new_dtags = TRUE;
+  link_info.new_dtags = DEFAULT_NEW_DTAGS;
 #endif
 
   ldfile_add_arch ("");

diff --git a/ld/testsuite/ld-elf/now-3.d b/ld/testsuite/ld-elf/now-3.d
index 687885ad4850e9c4820f7d335318cc6b6cbe336c..fa98065c6212079ee658d847953ea5d9a34a5c0a 100644 (file)
--- a/ld/testsuite/ld-elf/now-3.d
+++ b/ld/testsuite/ld-elf/now-3.d
@@ -1,6 +1,6 @@
 #source: start.s
 #readelf: -d -W
-#ld: -shared -z now
+#ld: -shared -z now --disable-new-dtags
 #target: *-*-linux* *-*-gnu*
 
 #failif

diff --git a/ld/testsuite/ld-elf/now-4.d b/ld/testsuite/ld-elf/now-4.d
index 8d9d02f92f9149819bfa1a0b6b6eb368f586c23d..421063d9386c6438ca18e120aea1824476f24c18 100644 (file)
--- a/ld/testsuite/ld-elf/now-4.d
+++ b/ld/testsuite/ld-elf/now-4.d
@@ -1,6 +1,6 @@
 #source: start.s
 #readelf: -d -W
-#ld: -shared -z now
+#ld: -shared -z now --disable-new-dtags
 #target: *-*-linux* *-*-gnu*
 
 #...

diff --git a/ld/testsuite/ld-elf/rpath-1.d b/ld/testsuite/ld-elf/rpath-1.d
index 918a326f04d0c321a4aeb46114ab28d59c6999de..38d6eab5e36388b7ba29bf41c8a4989d2f50e324 100644 (file)
--- a/ld/testsuite/ld-elf/rpath-1.d
+++ b/ld/testsuite/ld-elf/rpath-1.d
@@ -1,6 +1,6 @@
 #source: start.s
 #readelf: -d -W
-#ld: -shared -rpath .
+#ld: -shared -rpath=. --disable-new-dtags
 #target: *-*-linux* *-*-gnu*
 
 #failif

diff --git a/ld/testsuite/ld-elf/rpath-2.d b/ld/testsuite/ld-elf/rpath-2.d
index 17be86d1462363cd12b34c69bf3a3cdbcc638376..d4c75ff71b7a46d13e13006c0629fbf95552a9fc 100644 (file)
--- a/ld/testsuite/ld-elf/rpath-2.d
+++ b/ld/testsuite/ld-elf/rpath-2.d
@@ -1,6 +1,6 @@
 #source: start.s
 #readelf: -d -W
-#ld: -shared -rpath .
+#ld: -shared -rpath=. --disable-new-dtags
 #target: *-*-linux* *-*-gnu*
 
 #...