From: Hans-Peter Nilsson <hp@bitrange.com>
Date: Wed, 30 Aug 2017 00:27:14 +0000 (+0200)
Subject: testsuite/ld-cris various files: Run ld with --hash-style=sysv.
X-Git-Tag: users/ARM/embedded-binutils-master-2017q4~1285
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7dffc390cf861b313001fd08049a5fd8d758d0d;p=external%2Fbinutils.git

testsuite/ld-cris various files: Run ld with --hash-style=sysv.

	* testsuite/ld-cris/dso-pltdis1.d: Run ld with --hash-style=sysv.
	* testsuite/ld-cris/dso-pltdis2.d,
	testsuite/ld-cris/dso12-pltdis.d, testsuite/ld-cris/expdyn1.d,
	testsuite/ld-cris/expdyn5.d, testsuite/ld-cris/expdyn6.d,
	testsuite/ld-cris/expdyn7.d, testsuite/ld-cris/gotplt1.d,
	testsuite/ld-cris/gotplt2.d, testsuite/ld-cris/gotplt3.d,
	testsuite/ld-cris/hiddef1.d, testsuite/ld-cris/libdso-11.d,
	testsuite/ld-cris/libdso-12.d, testsuite/ld-cris/libdso-12b.d,
	testsuite/ld-cris/libdso-12c.d, testsuite/ld-cris/libdso-13.d,
	testsuite/ld-cris/libdso-13b.d, testsuite/ld-cris/libdso-14.d,
	testsuite/ld-cris/libdso-15.d, testsuite/ld-cris/libdso-15b.d,
	testsuite/ld-cris/libdso-1b.d, testsuite/ld-cris/libdso-1c.d,
	testsuite/ld-cris/libdso-1d.d, testsuite/ld-cris/libdso-4.d,
	testsuite/ld-cris/pr16044.d, testsuite/ld-cris/pv32-1.d,
	testsuite/ld-cris/tls-dso-dtpoffd2.d,
	testsuite/ld-cris/tls-dso-dtpoffd4.d,
	testsuite/ld-cris/tls-dso-tpoffgotcomm1.d,
	testsuite/ld-cris/tls-dso-x1x2-1.d, testsuite/ld-cris/tls-gc-71.d,
	testsuite/ld-cris/tls-ie-78.d, testsuite/ld-cris/tls-js1.d,
	testsuite/ld-cris/tls-ldgdex-14.d,
	testsuite/ld-cris/tls-ldgdex-15.d,
	testsuite/ld-cris/tls-legdx-16.d,
	testsuite/ld-cris/tls-legdx-17.d,
	testsuite/ld-cris/tls-local-63.d,
	testsuite/ld-cris/tls-local-64.d, testsuite/ld-cris/tls-ok-30.d,
	testsuite/ld-cris/tls-ok-32.d, testsuite/ld-cris/tls-ok-34.d,
	testsuite/ld-cris/tls-und-38.d, testsuite/ld-cris/tls-und-42.d,
	testsuite/ld-cris/tls-und-46.d, testsuite/ld-cris/tls-und-50.d,
	testsuite/ld-cris/weakref2.d, testsuite/ld-cris/weakref3.d,
	testsuite/ld-cris/weakref4.d: Likewise.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 8569569..725ce6c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,36 @@
+2017-08-30  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/ld-cris/dso-pltdis1.d: Run ld with --hash-style=sysv.
+	* testsuite/ld-cris/dso-pltdis2.d,
+	testsuite/ld-cris/dso12-pltdis.d, testsuite/ld-cris/expdyn1.d,
+	testsuite/ld-cris/expdyn5.d, testsuite/ld-cris/expdyn6.d,
+	testsuite/ld-cris/expdyn7.d, testsuite/ld-cris/gotplt1.d,
+	testsuite/ld-cris/gotplt2.d, testsuite/ld-cris/gotplt3.d,
+	testsuite/ld-cris/hiddef1.d, testsuite/ld-cris/libdso-11.d,
+	testsuite/ld-cris/libdso-12.d, testsuite/ld-cris/libdso-12b.d,
+	testsuite/ld-cris/libdso-12c.d, testsuite/ld-cris/libdso-13.d,
+	testsuite/ld-cris/libdso-13b.d, testsuite/ld-cris/libdso-14.d,
+	testsuite/ld-cris/libdso-15.d, testsuite/ld-cris/libdso-15b.d,
+	testsuite/ld-cris/libdso-1b.d, testsuite/ld-cris/libdso-1c.d,
+	testsuite/ld-cris/libdso-1d.d, testsuite/ld-cris/libdso-4.d,
+	testsuite/ld-cris/pr16044.d, testsuite/ld-cris/pv32-1.d,
+	testsuite/ld-cris/tls-dso-dtpoffd2.d,
+	testsuite/ld-cris/tls-dso-dtpoffd4.d,
+	testsuite/ld-cris/tls-dso-tpoffgotcomm1.d,
+	testsuite/ld-cris/tls-dso-x1x2-1.d, testsuite/ld-cris/tls-gc-71.d,
+	testsuite/ld-cris/tls-ie-78.d, testsuite/ld-cris/tls-js1.d,
+	testsuite/ld-cris/tls-ldgdex-14.d,
+	testsuite/ld-cris/tls-ldgdex-15.d,
+	testsuite/ld-cris/tls-legdx-16.d,
+	testsuite/ld-cris/tls-legdx-17.d,
+	testsuite/ld-cris/tls-local-63.d,
+	testsuite/ld-cris/tls-local-64.d, testsuite/ld-cris/tls-ok-30.d,
+	testsuite/ld-cris/tls-ok-32.d, testsuite/ld-cris/tls-ok-34.d,
+	testsuite/ld-cris/tls-und-38.d, testsuite/ld-cris/tls-und-42.d,
+	testsuite/ld-cris/tls-und-46.d, testsuite/ld-cris/tls-und-50.d,
+	testsuite/ld-cris/weakref2.d, testsuite/ld-cris/weakref3.d,
+	testsuite/ld-cris/weakref4.d: Likewise.
+
 2017-08-29  Jozef Lawrynowicz  <jozef.l@somniumtech.com>
 
 	* emultempl/msp430.em (change_output_section): New function.
diff --git a/ld/testsuite/ld-cris/dso-pltdis1.d b/ld/testsuite/ld-cris/dso-pltdis1.d
index e2c0f93..241328c 100644
--- a/ld/testsuite/ld-cris/dso-pltdis1.d
+++ b/ld/testsuite/ld-cris/dso-pltdis1.d
@@ -2,7 +2,7 @@
 #source: dsov32-2.s
 #source: dsofn4g.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -d -R
 
 # Check dissassembly of the .plt section, specifically the synthetic
diff --git a/ld/testsuite/ld-cris/dso-pltdis2.d b/ld/testsuite/ld-cris/dso-pltdis2.d
index 24da97a..1acea4e 100644
--- a/ld/testsuite/ld-cris/dso-pltdis2.d
+++ b/ld/testsuite/ld-cris/dso-pltdis2.d
@@ -2,7 +2,7 @@
 #source: dsov32-2.s
 #source: dsofng.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -d 
 
 # Complement to dso-pltdis1.d; merging the other .got.plt entry.
diff --git a/ld/testsuite/ld-cris/dso12-pltdis.d b/ld/testsuite/ld-cris/dso12-pltdis.d
index 187730b..0bfb846 100644
--- a/ld/testsuite/ld-cris/dso12-pltdis.d
+++ b/ld/testsuite/ld-cris/dso12-pltdis.d
@@ -2,7 +2,7 @@
 #source: dsov32-1.s
 #source: dsov32-2.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux -z nocombreloc
+#ld: --shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -d 
 
 # Check dissassembly of .plt section.
diff --git a/ld/testsuite/ld-cris/expdyn1.d b/ld/testsuite/ld-cris/expdyn1.d
index 51d875d..37cbe4d 100644
--- a/ld/testsuite/ld-cris/expdyn1.d
+++ b/ld/testsuite/ld-cris/expdyn1.d
@@ -1,6 +1,6 @@
 #source: expdyn1.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux -export-dynamic tmpdir/libdso-1.so
+#ld: -m crislinux -export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -T
 
 .*:     file format elf32-cris
diff --git a/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d
index 5504534..818ee4f 100644
--- a/ld/testsuite/ld-cris/expdyn5.d
+++ b/ld/testsuite/ld-cris/expdyn5.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
+#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 
 # Like expdyn2.d, but testing that the .got contents is correct.  There
diff --git a/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d
index 43d04ff..cf4a578 100644
--- a/ld/testsuite/ld-cris/expdyn6.d
+++ b/ld/testsuite/ld-cris/expdyn6.d
@@ -2,7 +2,7 @@
 #source: expdref1.s --pic
 #source: euwref1.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
+#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 
 # Like expdyn5.d, weakly referencing symbols.
diff --git a/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d
index 7bd91e0..6028343 100644
--- a/ld/testsuite/ld-cris/expdyn7.d
+++ b/ld/testsuite/ld-cris/expdyn7.d
@@ -2,7 +2,7 @@
 #source: expdref1.s --pic
 #source: comref1.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
+#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 
 # Like expdyn5.d, referencing COMMON symbols.
diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index 8fcb7b5..0f5472f 100644
--- a/ld/testsuite/ld-cris/gotplt1.d
+++ b/ld/testsuite/ld-cris/gotplt1.d
@@ -2,7 +2,7 @@
 #source: dsofnf2.s
 #source: gotrel1.s
 #as: --pic --no-underscore --em=criself
-#ld: -m crislinux tmpdir/libdso-1.so
+#ld: -m crislinux tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -sR
 
 # Make sure we don't merge a PLT-specific entry
diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index 48f1413..3a28111 100644
--- a/ld/testsuite/ld-cris/gotplt2.d
+++ b/ld/testsuite/ld-cris/gotplt2.d
@@ -2,7 +2,7 @@
 #source: dsofnf.s
 #source: gotrel1.s
 #as: --pic --no-underscore --em=criself
-#ld: -shared -m crislinux -z nocombreloc
+#ld: -shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -sR
 
 # Make sure we merge a PLT-specific entry (usually
diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index f4cb4be..727a17c 100644
--- a/ld/testsuite/ld-cris/gotplt3.d
+++ b/ld/testsuite/ld-cris/gotplt3.d
@@ -3,7 +3,7 @@
 #source: gotrel1.s
 #source: dso-1.s
 #as: --pic --no-underscore --em=criself
-#ld: -shared -m crislinux -z nocombreloc
+#ld: -shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -sR
 
 # Like gotplt2, but make sure we merge right when we have a
diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index 0be90a1..0f16b62 100644
--- a/ld/testsuite/ld-cris/hiddef1.d
+++ b/ld/testsuite/ld-cris/hiddef1.d
@@ -1,7 +1,7 @@
 #source: gotrel1.s
 #source: hiddef1.s
 #source: hidrefgotplt1.s
-#ld: -shared -m crislinux
+#ld: -shared -m crislinux --hash-style=sysv
 #as: --pic --no-underscore -I$srcdir/$subdir --em=criself
 #readelf: -S -s -r
 
diff --git a/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
index dc7b75a..b462433 100644
--- a/ld/testsuite/ld-cris/libdso-11.d
+++ b/ld/testsuite/ld-cris/libdso-11.d
@@ -1,7 +1,7 @@
 #source: dso-1.s
 #source: dsov32-1.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -T
 
 .*:     file format elf32-cris
diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index c8a4f62d..eba3ef4 100644
--- a/ld/testsuite/ld-cris/libdso-12.d
+++ b/ld/testsuite/ld-cris/libdso-12.d
@@ -2,7 +2,7 @@
 #source: dsov32-1.s
 #source: dsov32-2.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux -z nocombreloc
+#ld: --shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -s -T
 
 # Check for common DSO contents; load of GOT register, branch to
diff --git a/ld/testsuite/ld-cris/libdso-12b.d b/ld/testsuite/ld-cris/libdso-12b.d
index 87506ed..fb63d84 100644
--- a/ld/testsuite/ld-cris/libdso-12b.d
+++ b/ld/testsuite/ld-cris/libdso-12b.d
@@ -2,7 +2,7 @@
 #source: dsov32-1.s
 #source: dsov32-2.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -T
 
 # Like libdso-12.d but without -z nocombreloc.
diff --git a/ld/testsuite/ld-cris/libdso-12c.d b/ld/testsuite/ld-cris/libdso-12c.d
index 37eab56..5936956 100644
--- a/ld/testsuite/ld-cris/libdso-12c.d
+++ b/ld/testsuite/ld-cris/libdso-12c.d
@@ -3,7 +3,7 @@
 #source: dsov32-2.s
 #source: dso-1.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468
+#ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468 --hash-style=sysv
 #objdump: -s -T
 
 # Like libdso-12b.d, but dsofn is defined and the two called functions
diff --git a/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
index 772480e..1ef3cc4 100644
--- a/ld/testsuite/ld-cris/libdso-13.d
+++ b/ld/testsuite/ld-cris/libdso-13.d
@@ -1,7 +1,7 @@
 #source: dso-1.s
 #source: dsov32-3.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux -z nocombreloc --enable-new-dtags
+#ld: --shared -m crislinux -z nocombreloc --enable-new-dtags --hash-style=sysv
 #readelf: -d -r
 #warning: relocation R_CRIS_32_PCREL should not be used in a shared object; recompile with -fPIC
 
diff --git a/ld/testsuite/ld-cris/libdso-13b.d b/ld/testsuite/ld-cris/libdso-13b.d
index cd6f4e2..4008946 100644
--- a/ld/testsuite/ld-cris/libdso-13b.d
+++ b/ld/testsuite/ld-cris/libdso-13b.d
@@ -1,7 +1,7 @@
 #source: dso-1.s
 #source: dsov32-3.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468
+#ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468 --hash-style=sysv
 #readelf: -d -r
 
 # Like libdso-13.d, but without -z nocombreloc and with a version
diff --git a/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
index c0a20e8..b60f5e5 100644
--- a/ld/testsuite/ld-cris/libdso-14.d
+++ b/ld/testsuite/ld-cris/libdso-14.d
@@ -1,7 +1,7 @@
 #source: dso-1.s
 #source: dsov32-4.s
 #as: --pic --no-underscore --march=v32 --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #readelf: -d -r
 
 # Checking that a bsr to a non-PLT-decorated nonvisible function
diff --git a/ld/testsuite/ld-cris/libdso-15.d b/ld/testsuite/ld-cris/libdso-15.d
index ce57e97..61b546b 100644
--- a/ld/testsuite/ld-cris/libdso-15.d
+++ b/ld/testsuite/ld-cris/libdso-15.d
@@ -1,6 +1,6 @@
 #source: expdyn2.s
 #as: --pic --no-underscore --em=criself -I$srcdir/$subdir
-#ld: --shared -m crislinux --version-script $srcdir/$subdir/expalltst3
+#ld: --shared -m crislinux --version-script $srcdir/$subdir/expalltst3 --hash-style=sysv
 #objdump: -s -T
 
 # A DSO that has two versioned symbols, each with a weak alias.
diff --git a/ld/testsuite/ld-cris/libdso-15b.d b/ld/testsuite/ld-cris/libdso-15b.d
index 308b110..61ead56 100644
--- a/ld/testsuite/ld-cris/libdso-15b.d
+++ b/ld/testsuite/ld-cris/libdso-15b.d
@@ -1,6 +1,6 @@
 #source: expdref2.s
 #as: --pic --no-underscore --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-15.so
 #objdump: -s -T
 
diff --git a/ld/testsuite/ld-cris/libdso-1b.d b/ld/testsuite/ld-cris/libdso-1b.d
index 9ad2143..56e5788 100644
--- a/ld/testsuite/ld-cris/libdso-1b.d
+++ b/ld/testsuite/ld-cris/libdso-1b.d
@@ -1,6 +1,6 @@
 #source: dso-1b.s
 #as: --pic --no-underscore --em=criself -I$srcdir/$subdir
-#ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468
+#ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468 --hash-style=sysv
 #objdump: -T
 
 # Like libdso-1, but export the function as expfn@@TST2 and another
diff --git a/ld/testsuite/ld-cris/libdso-1c.d b/ld/testsuite/ld-cris/libdso-1c.d
index 066d5e2..0588d39 100644
--- a/ld/testsuite/ld-cris/libdso-1c.d
+++ b/ld/testsuite/ld-cris/libdso-1c.d
@@ -1,6 +1,6 @@
 #source: expdref1.s
 #as: --pic --no-underscore --em=criself -I$srcdir/$subdir
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-1b.so
 #objdump: -s -T
 
diff --git a/ld/testsuite/ld-cris/libdso-1d.d b/ld/testsuite/ld-cris/libdso-1d.d
index 47721de..a2a0ce5 100644
--- a/ld/testsuite/ld-cris/libdso-1d.d
+++ b/ld/testsuite/ld-cris/libdso-1d.d
@@ -1,7 +1,7 @@
 #source: expdref1.s
 #source: expdyn1w.s
 #as: --pic --no-underscore --em=criself -I$srcdir/$subdir
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-1b.so
 #objdump: -s -T
 
diff --git a/ld/testsuite/ld-cris/libdso-4.d b/ld/testsuite/ld-cris/libdso-4.d
index b7cc840..3d57395 100644
--- a/ld/testsuite/ld-cris/libdso-4.d
+++ b/ld/testsuite/ld-cris/libdso-4.d
@@ -1,6 +1,6 @@
 #source: dso-2.s
 #as: --pic --no-underscore --em=criself
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -T
 
 # DSO with an undef symbol "dsofn".  See undef1.d.
diff --git a/ld/testsuite/ld-cris/pr16044.d b/ld/testsuite/ld-cris/pr16044.d
index e5d373d..f8546f1 100644
--- a/ld/testsuite/ld-cris/pr16044.d
+++ b/ld/testsuite/ld-cris/pr16044.d
@@ -2,7 +2,7 @@
 #source: dso-2b.s
 #source: dso-1c.s
 #as: --pic --no-underscore --em=criself -I$srcdir/$subdir
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #readelf: -s -r
 
 # PR 16044 is about a (compile-time-non-local) hidden function symbol,
diff --git a/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
index c963ed1..c811744 100644
--- a/ld/testsuite/ld-cris/pv32-1.d
+++ b/ld/testsuite/ld-cris/pv32-1.d
@@ -1,6 +1,6 @@
 #source: pv32.s
 #as: --march=v32 --no-underscore --em=criself
-#ld: -e here -m crislinux tmpdir/libdso-12.so
+#ld: -e here -m crislinux tmpdir/libdso-12.so --hash-style=sysv
 #objdump: -s -T
 
 # Trivial test of linking a program to a v32 DSO.
diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
index 1db2b9a..7459d9f 100644
--- a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
+++ b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
@@ -4,7 +4,7 @@
 #source: tls128.s
 #source: tls-x.s
 #as: --no-underscore --em=criself --pic -I$srcdir/$subdir
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv --hash-style=sysv
 #objdump: -d -s -t -r -p
 
 # Linking a file with a DTPOFF from a .dtpoffd of a GD variable, PIC
diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
index 0f54e61..c66a982 100644
--- a/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
+++ b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
@@ -4,7 +4,7 @@
 #source: tls128.s
 #source: tls-commx.s
 #as: --no-underscore --em=criself --pic -I$srcdir/$subdir
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #objdump: -d -s -t -r -p
 
 # Linking a file with a DTPOFF from a .dtpoffd of a GD COMMON
diff --git a/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d b/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
index 0a2ee06..cfb44ac 100644
--- a/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
+++ b/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-dso-tpoffgotcomm1.s
 #as: --no-underscore --pic --em=criself -I$srcdir/$subdir
-#ld: -m crislinux -shared
+#ld: -m crislinux -shared --hash-style=sysv
 #objdump: -d -h -s -t -r -R -p
 
 # Make sure we can link a file with TPOFFGOT relocs against common
diff --git a/ld/testsuite/ld-cris/tls-dso-x1x2-1.d b/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
index b539748..6168701 100644
--- a/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
+++ b/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
@@ -1,7 +1,7 @@
 #source: tls-hx.s
 #source: tls-x1x2.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #objdump: -T
 
 # A DSO providing the TLS variables x1 and x2.
diff --git a/ld/testsuite/ld-cris/tls-gc-71.d b/ld/testsuite/ld-cris/tls-gc-71.d
index 9d87500..14feb3d 100644
--- a/ld/testsuite/ld-cris/tls-gc-71.d
+++ b/ld/testsuite/ld-cris/tls-gc-71.d
@@ -3,7 +3,7 @@
 #source: tls128g.s
 #source: tls-hx.s
 #as: --pic --no-underscore --em=criself -I$srcdir/$subdir
-#ld: --shared -m crislinux --gc-sections
+#ld: --shared -m crislinux --gc-sections --hash-style=sysv
 #objdump: -s -t -R -p -T
 
 # DSO with a single R_CRIS_16_DTPREL against a hidden symbol, gc:ed.
diff --git a/ld/testsuite/ld-cris/tls-ie-78.d b/ld/testsuite/ld-cris/tls-ie-78.d
index 3994df8..a402115 100644
--- a/ld/testsuite/ld-cris/tls-ie-78.d
+++ b/ld/testsuite/ld-cris/tls-ie-78.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-ie-8e.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux
+#ld: -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/tls-dso-xz-1.so
 #objdump: -s -h -t -T -R -r -p
 
diff --git a/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
index 0c1509f..3ac1c68 100644
--- a/ld/testsuite/ld-cris/tls-js1.d
+++ b/ld/testsuite/ld-cris/tls-js1.d
@@ -5,7 +5,7 @@
 #source: tls-hx.s
 #source: dso-1.s
 #as: --pic --no-underscore --em=criself --march=v32
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #readelf: -a
 
 # DSO with a R_CRIS_16_DTPREL and a R_CRIS_32_PLT_PCREL.  The .got.plt
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-14.d b/ld/testsuite/ld-cris/tls-ldgdex-14.d
index 83d94a7..bb497bb 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-14.d
@@ -5,7 +5,7 @@
 #source: tls-ldgd-14.s
 #source: tls-hx1x2.s
 #as: --pic --no-underscore --em=criself
-#ld: -m crislinux tmpdir/tls-dso-xz-1.so
+#ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 
 # Check that we have proper NPTL/TLS markings and GOT for two
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-15.d b/ld/testsuite/ld-cris/tls-ldgdex-15.d
index fca739b..45e5ec3 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-15.d
@@ -5,7 +5,7 @@
 #source: tls-ldgd-15.s
 #source: tls-hx1x2.s
 #as: --pic --no-underscore --em=criself
-#ld: -m crislinux tmpdir/tls-dso-xz-1.so
+#ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 
 # Check that we have proper NPTL/TLS markings and GOT for two
diff --git a/ld/testsuite/ld-cris/tls-legdx-16.d b/ld/testsuite/ld-cris/tls-legdx-16.d
index 1e3bc3e..a597167 100644
--- a/ld/testsuite/ld-cris/tls-legdx-16.d
+++ b/ld/testsuite/ld-cris/tls-legdx-16.d
@@ -5,7 +5,7 @@
 #source: tls-legd-16.s
 #source: tls-x1x2.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux tmpdir/tls-dso-xz-1.so
+#ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 
 # Check that we have proper NPTL/TLS markings and GOT for an
diff --git a/ld/testsuite/ld-cris/tls-legdx-17.d b/ld/testsuite/ld-cris/tls-legdx-17.d
index 1d1c5ea..c5b7b4b 100644
--- a/ld/testsuite/ld-cris/tls-legdx-17.d
+++ b/ld/testsuite/ld-cris/tls-legdx-17.d
@@ -5,7 +5,7 @@
 #source: tls-ldgd-14.s --pic
 #source: tls-x1x2.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux tmpdir/tls-dso-xz-1.so
+#ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 
 # Check that we have proper NPTL/TLS markings and GOT for an
diff --git a/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
index 320e717..256542c 100644
--- a/ld/testsuite/ld-cris/tls-local-63.d
+++ b/ld/testsuite/ld-cris/tls-local-63.d
@@ -1,7 +1,7 @@
 #source: tls-ie-8.s --pic
 #source: tls-hx.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 6 -x 8 -x 5
 
 # A R_CRIS_16_GOT_TPREL in a DSO against a hidden symbol.  Make sure
diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index 8fb44ee..9449f1f 100644
--- a/ld/testsuite/ld-cris/tls-local-64.d
+++ b/ld/testsuite/ld-cris/tls-local-64.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-hx.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 6 -x 8 -x 5
 
 # A R_CRIS_16_GOT_TPREL in a DSO against a hidden symbol, at an offset
diff --git a/ld/testsuite/ld-cris/tls-ok-30.d b/ld/testsuite/ld-cris/tls-ok-30.d
index 94ed194..fef40b3 100644
--- a/ld/testsuite/ld-cris/tls-ok-30.d
+++ b/ld/testsuite/ld-cris/tls-ok-30.d
@@ -1,6 +1,6 @@
 #source: tls-gdgotrelm.s --defsym r=8191
 #as: --no-underscore --em=criself --pic
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -j .got -R
 
 # Verify that the first and last R_CRIS_16_GOT_GD entries are ok just
diff --git a/ld/testsuite/ld-cris/tls-ok-32.d b/ld/testsuite/ld-cris/tls-ok-32.d
index 8042e28..602710e 100644
--- a/ld/testsuite/ld-cris/tls-ok-32.d
+++ b/ld/testsuite/ld-cris/tls-ok-32.d
@@ -1,6 +1,6 @@
 #source: tls-dtprelm.s --defsym r=32767
 #as: --no-underscore --em=criself --pic
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -j .got -j .text -j .tdata -R
 
 # Check that a R_CRIS_16_DTPREL just below the theoretical limit
diff --git a/ld/testsuite/ld-cris/tls-ok-34.d b/ld/testsuite/ld-cris/tls-ok-34.d
index f534c993..ba3d1ae 100644
--- a/ld/testsuite/ld-cris/tls-ok-34.d
+++ b/ld/testsuite/ld-cris/tls-ok-34.d
@@ -1,6 +1,6 @@
 #source: tls-gottprelm.s --defsym r=8189
 #as: --no-underscore --em=criself --pic
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -j .got -R
 
 # Check that a R_CRIS_16_DTPREL just below the theoretical limit
diff --git a/ld/testsuite/ld-cris/tls-und-38.d b/ld/testsuite/ld-cris/tls-und-38.d
index 7830672..8cda650 100644
--- a/ld/testsuite/ld-cris/tls-und-38.d
+++ b/ld/testsuite/ld-cris/tls-und-38.d
@@ -1,6 +1,6 @@
 #source: tls-gd-2.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 
 # Undefined reference for a R_CRIS_32_GOT_GD in a DSO.  Not an error;
diff --git a/ld/testsuite/ld-cris/tls-und-42.d b/ld/testsuite/ld-cris/tls-und-42.d
index db45264..7a1a831 100644
--- a/ld/testsuite/ld-cris/tls-und-42.d
+++ b/ld/testsuite/ld-cris/tls-und-42.d
@@ -1,6 +1,6 @@
 #source: tls-ie-10.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 
 # Undefined reference for a R_CRIS_32_GOT_TPREL in a DSO.  Not an
diff --git a/ld/testsuite/ld-cris/tls-und-46.d b/ld/testsuite/ld-cris/tls-und-46.d
index 92755d4..bb38da4 100644
--- a/ld/testsuite/ld-cris/tls-und-46.d
+++ b/ld/testsuite/ld-cris/tls-und-46.d
@@ -1,6 +1,6 @@
 #source: tls-gd-1.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 
 # Undefined reference for a R_CRIS_16_GOT_GD in a DSO.  Not an error;
diff --git a/ld/testsuite/ld-cris/tls-und-50.d b/ld/testsuite/ld-cris/tls-und-50.d
index 6814aac..30274f5 100644
--- a/ld/testsuite/ld-cris/tls-und-50.d
+++ b/ld/testsuite/ld-cris/tls-und-50.d
@@ -1,6 +1,6 @@
 #source: tls-ie-8.s --pic
 #as: --no-underscore --em=criself
-#ld: -m crislinux --shared
+#ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 
 # Undefined reference for a R_CRIS_16_GOT_TPREL in a DSO.  Not an
diff --git a/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
index b78ccca..9b50dbf 100644
--- a/ld/testsuite/ld-cris/weakref2.d
+++ b/ld/testsuite/ld-cris/weakref2.d
@@ -1,6 +1,6 @@
 #source: gotrel2.s
 #as: --pic --no-underscore --em=criself
-#ld: -m crislinux tmpdir/libdso-1.so
+#ld: -m crislinux tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 
 # Like weakref1.d, but check contents of .got.
diff --git a/ld/testsuite/ld-cris/weakref3.d b/ld/testsuite/ld-cris/weakref3.d
index 4807106..aa59325 100644
--- a/ld/testsuite/ld-cris/weakref3.d
+++ b/ld/testsuite/ld-cris/weakref3.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: expdref3.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux
+#ld: -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-15.so
 #readelf: -a -x 10
 
diff --git a/ld/testsuite/ld-cris/weakref4.d b/ld/testsuite/ld-cris/weakref4.d
index aed0f39..3cc3c76 100644
--- a/ld/testsuite/ld-cris/weakref4.d
+++ b/ld/testsuite/ld-cris/weakref4.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: expdref4.s
 #as: --no-underscore --em=criself
-#ld: -m crislinux
+#ld: -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-15.so
 #readelf: -a -x 11