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.

Change-Id: I6331b0a46be98386c8248bf1e126056be84972ad

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 6a33431..ecabc0f 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -286,7 +286,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 687885a..fa98065 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 8d9d02f..421063d 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 918a326..38d6eab 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 17be86d..d4c75ff 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*
 
 #...