summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2017-06-05 14:43:54 +0930
committerDongkyun, Son <dongkyun.s@samsung.com>2017-06-05 17:46:37 +0900
commit93a38e317f8f0889744a7736c12a969785f66d34 (patch)
treebdb2f2e450ea98a558fa4c4ec421b7ee9ee78798
parent08a741a1a58641f7d9df899491c0ba08398e7887 (diff)
downloadbinutils-93a38e317f8f0889744a7736c12a969785f66d34.tar.gz
binutils-93a38e317f8f0889744a7736c12a969785f66d34.tar.bz2
binutils-93a38e317f8f0889744a7736c12a969785f66d34.zip
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
-rw-r--r--ld/ldmain.c2
-rw-r--r--ld/testsuite/ld-elf/now-3.d2
-rw-r--r--ld/testsuite/ld-elf/now-4.d2
-rw-r--r--ld/testsuite/ld-elf/rpath-1.d2
-rw-r--r--ld/testsuite/ld-elf/rpath-2.d2
5 files changed, 5 insertions, 5 deletions
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 6a3343152a2..ecabc0f59f9 100644
--- 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 687885ad485..fa98065c621 100644
--- 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 8d9d02f92f9..421063d9386 100644
--- 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 918a326f04d..38d6eab5e36 100644
--- 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 17be86d1462..d4c75ff71b7 100644
--- 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*
#...