cris/testsuite: don't use --em=

Using such abbreviations is fine when written on an interactive command
line by a human. In scripts and alike, doing so risks colliding with
later option additions, as is about to occur for gas: Shortly there'll
be --emit-local-absolute.

diff --git a/gas/testsuite/gas/cris/mulbug-err-1.s b/gas/testsuite/gas/cris/mulbug-err-1.s
index b8a0d9ca0ac891d5fb57c2b026e92c7bfc73ac73..c966e18096449d527ea2ac934721bf41c9baaaca 100644 (file)
--- a/gas/testsuite/gas/cris/mulbug-err-1.s
+++ b/gas/testsuite/gas/cris/mulbug-err-1.s
@@ -2,7 +2,7 @@
 ; a hardware bug.
 
 ;  { dg-do assemble { target cris-*-* } }
-;  { dg-options "--em=criself" }
+;  { dg-options "--emulation=criself" }
 
  ; First, .text isn't dword-aligned by default.
  .text

diff --git a/gas/testsuite/gas/cris/pic-err-1.s b/gas/testsuite/gas/cris/pic-err-1.s
index a27981c6795171f050a236d5340598e992c65a55..6adf909da9204e085d6583cbee92215fd9b61ece 100644 (file)
--- a/gas/testsuite/gas/cris/pic-err-1.s
+++ b/gas/testsuite/gas/cris/pic-err-1.s
@@ -3,7 +3,7 @@
 ; not being in 16-bit range, so no error is recognized for a 16-bit operand.
 
 ; { dg-do assemble { target cris-*-* } }
-; { dg-options "--pic --no-underscore --em=criself" }
+; { dg-options "--pic --no-underscore --emulation=criself" }
 
  .syntax no_register_prefix
  .text

diff --git a/gas/testsuite/gas/cris/pic-err-2.s b/gas/testsuite/gas/cris/pic-err-2.s
index 1720054b56a9937f540ae5e5a13f9d91d578f2b3..eff165a2fc3eaa52570605885a21b978607a71b9 100644 (file)
--- a/gas/testsuite/gas/cris/pic-err-2.s
+++ b/gas/testsuite/gas/cris/pic-err-2.s
@@ -1,6 +1,6 @@
 ; Check that --pic isn't recognized for a.out files, specified by emulation.
 
 ; { dg-do assemble { target cris-*-* } }
-; { dg-options "--pic --em=crisaout" }
+; { dg-options "--pic --emulation=crisaout" }
 ; { dg-error ".* --pic is invalid" "" { target cris-*-* } 0 }
  nop

diff --git a/gas/testsuite/gas/cris/rd-abs32-1.d b/gas/testsuite/gas/cris/rd-abs32-1.d
index aee95ff5c337714917b85b77b3e38d5562a18e98..f57ae174414083afb15b2bf4c5d799c63ae9cf95 100644 (file)
--- a/gas/testsuite/gas/cris/rd-abs32-1.d
+++ b/gas/testsuite/gas/cris/rd-abs32-1.d
@@ -1,5 +1,5 @@
 #source: abs32-1.s
-#as: --em=criself
+#as: --emulation=criself
 #objdump: -dr
 
 # Check that jump-type instructions to absolute addresses

diff --git a/gas/testsuite/gas/cris/rd-abs32-2.d b/gas/testsuite/gas/cris/rd-abs32-2.d
index 20fc30205aefbec04fc359b43659c812fbb103ae..d1b6646becc1bea08aaf785dad5a1625c789528d 100644 (file)
--- a/gas/testsuite/gas/cris/rd-abs32-2.d
+++ b/gas/testsuite/gas/cris/rd-abs32-2.d
@@ -1,5 +1,5 @@
 #source: abs32-1.s
-#as: --em=criself --march=v32
+#as: --emulation=criself --march=v32
 #objdump: -dr
 
 # Check that jump-type instructions to absolute addresses

diff --git a/gas/testsuite/gas/cris/rd-arch-1.d b/gas/testsuite/gas/cris/rd-arch-1.d
index 12c6c6ee7a56fdcac1cbe4808586f4f0b72dc896..152b8c9622cdda3fb56fc26573cefdd4852384f5 100644 (file)
--- a/gas/testsuite/gas/cris/rd-arch-1.d
+++ b/gas/testsuite/gas/cris/rd-arch-1.d
@@ -1,5 +1,5 @@
 #source: arch-err-2.s
-#as: --march=v32 --underscore --em=criself
+#as: --march=v32 --underscore --emulation=criself
 #objdump: -p
 
 #...

diff --git a/gas/testsuite/gas/cris/rd-arch-2.d b/gas/testsuite/gas/cris/rd-arch-2.d
index 69e5b6fb54187553ebbf96066c725f9958f360fc..a65902066735d1423bc8d6ae3fe3bb6de6acac44 100644 (file)
--- a/gas/testsuite/gas/cris/rd-arch-2.d
+++ b/gas/testsuite/gas/cris/rd-arch-2.d
@@ -1,5 +1,5 @@
 #source: arch-err-4.s
-#as: --underscore --march=common_v10_v32 --em=criself
+#as: --underscore --march=common_v10_v32 --emulation=criself
 #objdump: -p
 
 #...

diff --git a/gas/testsuite/gas/cris/rd-arch-3.d b/gas/testsuite/gas/cris/rd-arch-3.d
index 022c1f01cc11d775fcd8108137cb77e035054e32..2c051ba25521365093aa1bd1c0f8ca223c7c7694 100644 (file)
--- a/gas/testsuite/gas/cris/rd-arch-3.d
+++ b/gas/testsuite/gas/cris/rd-arch-3.d
@@ -1,5 +1,5 @@
 #source: arch-err-5.s
-#as: --march=v0_v10 --underscore --em=criself
+#as: --march=v0_v10 --underscore --emulation=criself
 #objdump: -p
 
 #...

diff --git a/gas/testsuite/gas/cris/rd-bcnst-pic.d b/gas/testsuite/gas/cris/rd-bcnst-pic.d
index 365a6a4c72375b8b42023f74f30e8904d91669ea..bf5ac1425d7db055ba1ca7679cde749557c74364 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bcnst-pic.d
+++ b/gas/testsuite/gas/cris/rd-bcnst-pic.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --pic --underscore --em=criself
+#as: --pic --underscore --emulation=criself
 #source: rd-bcnst.s
 
 # Catches an error in the relaxation machinery and checks that there's no

diff --git a/gas/testsuite/gas/cris/rd-bcnst2-pic.d b/gas/testsuite/gas/cris/rd-bcnst2-pic.d
index c1e11a10357cf678d4ded07225d0d1a945680b71..3428b496477cd055adbc6e003690c54cc094e083 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bcnst2-pic.d
+++ b/gas/testsuite/gas/cris/rd-bcnst2-pic.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --pic --underscore --em=criself
+#as: --pic --underscore --emulation=criself
 #source: rd-bcnst2.s
 
 # Catches an error in the relaxation machinery.

diff --git a/gas/testsuite/gas/cris/rd-bcnst2.d b/gas/testsuite/gas/cris/rd-bcnst2.d
index 019218501f733e2de24cf078c5f4458bfd5802b3..327185c02ae56535033eb55ee5020534cc730727 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bcnst2.d
+++ b/gas/testsuite/gas/cris/rd-bcnst2.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --underscore --em=criself
+#as: --underscore --emulation=criself
 
 # Consistency check, corresponding to rd-bcnst2-pic.d.
 

diff --git a/gas/testsuite/gas/cris/rd-bkw1b.d b/gas/testsuite/gas/cris/rd-bkw1b.d
index 19e9d71b299ae098afdca870a993ba7246fcd18b..706370aa9d8937b186bce086cd39c88c4d811336 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw1b.d
+++ b/gas/testsuite/gas/cris/rd-bkw1b.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #source: brokw-1.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-bkw2b.d b/gas/testsuite/gas/cris/rd-bkw2b.d
index 1d268b3a44c08362e66f55ec5bd6f1e7320e43f1..0165f004c22414e5e0753e61c85d2ed60f3dc900 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw2b.d
+++ b/gas/testsuite/gas/cris/rd-bkw2b.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #source: brokw-2.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-bkw3b.d b/gas/testsuite/gas/cris/rd-bkw3b.d
index 4a7cca9bb2e2e01da0739b38371cbca62b8ffe0d..b46dc04ca49e1a3813730f8f9ecc5965d820e2f2 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw3b.d
+++ b/gas/testsuite/gas/cris/rd-bkw3b.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #source: brokw-3b.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-bkw4.d b/gas/testsuite/gas/cris/rd-bkw4.d
index 73d56b08ca23de55bb68c6a9383464ac0482b48b..6481615e81cb61630036ba666a28eb8f38b9b3e5 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw4.d
+++ b/gas/testsuite/gas/cris/rd-bkw4.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself
+#as: --underscore --emulation=criself
 #objdump: -dr
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-bkw4v32.d b/gas/testsuite/gas/cris/rd-bkw4v32.d
index 35fa5b2230adbf0ee5da4fe09f0ee4210b540ab2..8ec82ede4c2026be32448f10bad523ea559a284d 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw4v32.d
+++ b/gas/testsuite/gas/cris/rd-bkw4v32.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #source: rd-bkw4.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-bkw5.d b/gas/testsuite/gas/cris/rd-bkw5.d
index da501346acb880afaa14742696b823873d34d8d9..961400d1a6904ba3e7ac16d8a0738438ef3b871b 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5.d
+++ b/gas/testsuite/gas/cris/rd-bkw5.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself
+#as: --underscore --emulation=criself
 #objdump: -dr
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-bkw5b.d b/gas/testsuite/gas/cris/rd-bkw5b.d
index f26758324c1f8c455167739eb4710422e661553e..6a5d97c25eb827a88437c961ee2bf0e06636bbdc 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5b.d
+++ b/gas/testsuite/gas/cris/rd-bkw5b.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --defsym extra=1
+#as: --underscore --emulation=criself --defsym extra=1
 #objdump: -dr
 #source: rd-bkw5.s
 #error: overflow

diff --git a/gas/testsuite/gas/cris/rd-bkw5bpic.d b/gas/testsuite/gas/cris/rd-bkw5bpic.d
index c83bf2bf1d0fe7961d390153c41f93477abce67b..7429c0c8507b842a21884d950b835d29904cc097 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5bpic.d
+++ b/gas/testsuite/gas/cris/rd-bkw5bpic.d
@@ -1,4 +1,4 @@
-#as: --pic --underscore --em=criself --defsym extra=-818
+#as: --pic --underscore --emulation=criself --defsym extra=-818
 #objdump: -dr
 #source: rd-bkw5.s
 #error: overflow

diff --git a/gas/testsuite/gas/cris/rd-bkw5bv32.d b/gas/testsuite/gas/cris/rd-bkw5bv32.d
index 1b87c3ee5693d02e19952e27b8a6de5a77d76c68..7f539c307f8f856b7fd3bd3b084bdbea1ee31f72 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5bv32.d
+++ b/gas/testsuite/gas/cris/rd-bkw5bv32.d
@@ -1,4 +1,4 @@
-#as: --march=v32 --underscore --em=criself --defsym extra=-818
+#as: --march=v32 --underscore --emulation=criself --defsym extra=-818
 #objdump: -dr
 #source: rd-bkw5.s
 #error: overflow

diff --git a/gas/testsuite/gas/cris/rd-bkw5bv32pic.d b/gas/testsuite/gas/cris/rd-bkw5bv32pic.d
index a63ab512a9874a717e54324f6defabc6ba42df0c..800f1e1e5f3d05eca8db61610f2721be6a740e65 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5bv32pic.d
+++ b/gas/testsuite/gas/cris/rd-bkw5bv32pic.d
@@ -1,4 +1,4 @@
-#as: --march=v32 --pic --underscore --em=criself --defsym extra=-818
+#as: --march=v32 --pic --underscore --emulation=criself --defsym extra=-818
 #objdump: -dr
 #source: rd-bkw5.s
 #error: overflow

diff --git a/gas/testsuite/gas/cris/rd-bkw5pic.d b/gas/testsuite/gas/cris/rd-bkw5pic.d
index e22d8932d5d5f4eb3e3d30e63f39d69bbe5270d6..1027f11c859684102675e79a62eced809c23b6d7 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5pic.d
+++ b/gas/testsuite/gas/cris/rd-bkw5pic.d
@@ -1,4 +1,4 @@
-#as: --pic --underscore --em=criself --defsym extra=-819
+#as: --pic --underscore --emulation=criself --defsym extra=-819
 #objdump: -dr
 #source: rd-bkw5.s
 

diff --git a/gas/testsuite/gas/cris/rd-bkw5v32.d b/gas/testsuite/gas/cris/rd-bkw5v32.d
index 5b1a90ddeea9a9700543d1e407ae0ef2a50a08e8..c50acc0dc601c74965ad2fa73a80625c81e558b5 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5v32.d
+++ b/gas/testsuite/gas/cris/rd-bkw5v32.d
@@ -1,4 +1,4 @@
-#as: --march=v32 --underscore --em=criself --defsym extra=-819
+#as: --march=v32 --underscore --emulation=criself --defsym extra=-819
 #objdump: -dr
 #source: rd-bkw5.s
 

diff --git a/gas/testsuite/gas/cris/rd-bkw5v32pic.d b/gas/testsuite/gas/cris/rd-bkw5v32pic.d
index 9998db44076df8134d497b65274ba45121f344ac..0bba23fd352872a2f7efe68c7a4a3ecfaeae6db3 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bkw5v32pic.d
+++ b/gas/testsuite/gas/cris/rd-bkw5v32pic.d
@@ -1,4 +1,4 @@
-#as: --march=v32 --pic --underscore --em=criself --defsym extra=-819
+#as: --march=v32 --pic --underscore --emulation=criself --defsym extra=-819
 #objdump: -dr
 #source: rd-bkw5.s
 

diff --git a/gas/testsuite/gas/cris/rd-bound1.d b/gas/testsuite/gas/cris/rd-bound1.d
index 40bfd34b8c36531100c2ea02b60ba457a9adf1c0..468dff0fc8f67175cc8f7409daa08ed047fa97d2 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bound1.d
+++ b/gas/testsuite/gas/cris/rd-bound1.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself
+#as: --underscore --emulation=criself
 #objdump: -dr
 .*:     file format elf32-us-cris
 Disassembly of section \.text:

diff --git a/gas/testsuite/gas/cris/rd-bound2.d b/gas/testsuite/gas/cris/rd-bound2.d
index e0aec151f7c94222f422ccdf36f289a2a2e49301..f9926d942b52235b0aced57265b76962012ea0d8 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bound2.d
+++ b/gas/testsuite/gas/cris/rd-bound2.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #source: rd-bound1.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-bound3.d b/gas/testsuite/gas/cris/rd-bound3.d
index 874c29016e8c39ed3e62b1b737ba2a372ebc71f3..dfad3b11093091e2ec1ea56716bee9cb1eb75a51 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bound3.d
+++ b/gas/testsuite/gas/cris/rd-bound3.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v10
+#as: --underscore --emulation=criself --march=v10
 #source: bound-err-1.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-bound4.d b/gas/testsuite/gas/cris/rd-bound4.d
index 1b0670ab2681e5c162784300809d2d71a3d174a0..56af3b7a3ec363c86a644746ea8dc50d375c86e6 100644 (file)
--- a/gas/testsuite/gas/cris/rd-bound4.d
+++ b/gas/testsuite/gas/cris/rd-bound4.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=common_v10_v32
+#as: --underscore --emulation=criself --march=common_v10_v32
 #source: rd-bound1.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-branch-pic.d b/gas/testsuite/gas/cris/rd-branch-pic.d
index 4c6b59abc790c93f9d1334cfa53321595b0d32c1..d57c60bce079556717f2dbb0ac4a28d3151312de 100644 (file)
--- a/gas/testsuite/gas/cris/rd-branch-pic.d
+++ b/gas/testsuite/gas/cris/rd-branch-pic.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --pic --underscore --em=criself
+#as: --pic --underscore --emulation=criself
 #source: branch.s
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-break32.d b/gas/testsuite/gas/cris/rd-break32.d
index ba7c518e057b61485b1e90eef0e7bcd041e7be0c..daeb8863c6a1e59860c48c4b7496a5d5bb610d4f 100644 (file)
--- a/gas/testsuite/gas/cris/rd-break32.d
+++ b/gas/testsuite/gas/cris/rd-break32.d
@@ -1,4 +1,4 @@
-#as: --march=v32 --em=criself
+#as: --march=v32 --emulation=criself
 #source: break.s
 #objdump: -dr
 

diff --git a/gas/testsuite/gas/cris/rd-brokw-pic-3.d b/gas/testsuite/gas/cris/rd-brokw-pic-3.d
index bf3170cb25f0ba3f757df204a756a551520e1c20..2d57b4174a5c3a6c62d4dd4f5eb4f3db1db16355 100644 (file)
--- a/gas/testsuite/gas/cris/rd-brokw-pic-3.d
+++ b/gas/testsuite/gas/cris/rd-brokw-pic-3.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --underscore --pic --em=criself
+#as: --underscore --pic --emulation=criself
 #source: brokw-3.s
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-dtpoffd1.d b/gas/testsuite/gas/cris/rd-dtpoffd1.d
index b5c657313aa1ca5133b002dfcfa6408e441373ff..7bc35e9af308a1fb1970be3d8fb372ca7c0d2c2a 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dtpoffd1.d
+++ b/gas/testsuite/gas/cris/rd-dtpoffd1.d
@@ -1,5 +1,5 @@
 #objdump: -sr
-#as: --em=criself
+#as: --emulation=criself
 
 # Checking .dtpoffd output.
 

diff --git a/gas/testsuite/gas/cris/rd-dw2-1.d b/gas/testsuite/gas/cris/rd-dw2-1.d
index fcf3170c0aa49256f4dea670dc5b98e3ae8dfef9..915ac8c8027f44ba9b4d6340eb1e381ffd921150 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-1.d
+++ b/gas/testsuite/gas/cris/rd-dw2-1.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: addi.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 # A most simple instruction sequence.
 #...
  Line Number Statements:

diff --git a/gas/testsuite/gas/cris/rd-dw2-10.d b/gas/testsuite/gas/cris/rd-dw2-10.d
index 0ca9208b71dd1439d9433ea3b914489bac7bbd2e..dfc555fa9d3b31e138d7d2b82e81347d3d96ef46 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-10.d
+++ b/gas/testsuite/gas/cris/rd-dw2-10.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: continue.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Continued line.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-11.d b/gas/testsuite/gas/cris/rd-dw2-11.d
index 67d57dcb20eb5b19c57a7be9f3424bb89225da6b..b3287c4b025d1eca395d7c960ff8fdc199558aac 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-11.d
+++ b/gas/testsuite/gas/cris/rd-dw2-11.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: fragtest.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Highly "fragmented" code.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-12.d b/gas/testsuite/gas/cris/rd-dw2-12.d
index a1c48957e5d3b243e29fee32f953dee7397f3e09..f3c4e6a70d771fb03565781eec3ceeb4ecbb4223 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-12.d
+++ b/gas/testsuite/gas/cris/rd-dw2-12.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: pushpop.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Pushes and other prefixes.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-13.d b/gas/testsuite/gas/cris/rd-dw2-13.d
index 42c9b5275773f9078fc889a558d45d26aa4a258b..fc59c923cf59e4cc78cdfc74250894f0a2d42f5f 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-13.d
+++ b/gas/testsuite/gas/cris/rd-dw2-13.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: rd-pic-1.s
-#as: --em=criself --pic --gdwarf2
+#as: --emulation=criself --pic --gdwarf2
 
 # PIC prefix relocs.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-14.d b/gas/testsuite/gas/cris/rd-dw2-14.d
index dabbc15ede62afbe826fd306ee9d3f01c5b5478c..e5539a277f6cb23029199254e17bf2091193b5fe 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-14.d
+++ b/gas/testsuite/gas/cris/rd-dw2-14.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: unimplemented.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Prefixes of various sizes.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-15.d b/gas/testsuite/gas/cris/rd-dw2-15.d
index b4bdd686e8521eae0d031938428a7897ba992fc2..b09cf95a5921e4824b64bfbdf8b9e9560d45e047 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-15.d
+++ b/gas/testsuite/gas/cris/rd-dw2-15.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: prefix.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Various prefixes, assembled standalone.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-2.d b/gas/testsuite/gas/cris/rd-dw2-2.d
index a567e118943431d1ef3a384e3a3cad40786263cb..67b726bcf669e4b36031fb5b22b61906f3f566e0 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-2.d
+++ b/gas/testsuite/gas/cris/rd-dw2-2.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: binop-segref.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Simple instruction sequence with content-emitting pseudo-ops.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-3.d b/gas/testsuite/gas/cris/rd-dw2-3.d
index aec1c7c7c214dfd773bfa6e749384f58520ea611..325fe02c2d18efa23716110cdae3b5ea154899ad 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-3.d
+++ b/gas/testsuite/gas/cris/rd-dw2-3.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: branch-warn-1.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Simple branch-expansion, type 1.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-4.d b/gas/testsuite/gas/cris/rd-dw2-4.d
index 6614eb6a14cad596faff791875b113d1f4d9169a..bc8931678c64bcbce66d0fba6b57ade439403f1c 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-4.d
+++ b/gas/testsuite/gas/cris/rd-dw2-4.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: branch-warn-2.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Simple branch-expansion, type 2.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-5.d b/gas/testsuite/gas/cris/rd-dw2-5.d
index e9664f10856813be9af6c45bda3b2f9da5148b28..6bbbbf6de12049b07abda4a56879d94a6c83ca23 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-5.d
+++ b/gas/testsuite/gas/cris/rd-dw2-5.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: branch-warn-3.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Simple branch-expansion, type 3.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-6.d b/gas/testsuite/gas/cris/rd-dw2-6.d
index 1c2051bdcb68d042d1c0f40276df23ac1f5264bf..3d0b408abc5265ce8339e000281716ad4171b60e 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-6.d
+++ b/gas/testsuite/gas/cris/rd-dw2-6.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: branch.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Complicated branch expansion.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-7.d b/gas/testsuite/gas/cris/rd-dw2-7.d
index d463ebb2acf48843728faac0eb3ad65c13e97a17..1ac16c2a3a048e4419413653768d738855d95550 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-7.d
+++ b/gas/testsuite/gas/cris/rd-dw2-7.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: brokw-1.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Most simple broken word.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-8.d b/gas/testsuite/gas/cris/rd-dw2-8.d
index a50de2fb9251bd3cf3e305c32792e52bd2ffe825..2aaa4fbb355f3cac908b414bc7c6a8b28e24d8e4 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-8.d
+++ b/gas/testsuite/gas/cris/rd-dw2-8.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: brokw-2.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Simple broken word, table with two labels.
 #...

diff --git a/gas/testsuite/gas/cris/rd-dw2-9.d b/gas/testsuite/gas/cris/rd-dw2-9.d
index 0f2a12c4667bab1076381a4a759510ab385ed324..9020d05b431e26404e25a6b8374f225f559ad7f1 100644 (file)
--- a/gas/testsuite/gas/cris/rd-dw2-9.d
+++ b/gas/testsuite/gas/cris/rd-dw2-9.d
@@ -1,6 +1,6 @@
 #readelf: -wl
 #source: brokw-3.s
-#as: --em=criself --gdwarf2
+#as: --emulation=criself --gdwarf2
 
 # Long broken word table.
 #...

diff --git a/gas/testsuite/gas/cris/rd-mulbug-1.d b/gas/testsuite/gas/cris/rd-mulbug-1.d
index 42ac192a6a7c447605e2d0540ea4d99f09eeb16f..9eaeb5d022a88e278b8a43e7a9c1e28cf7b39e78 100644 (file)
--- a/gas/testsuite/gas/cris/rd-mulbug-1.d
+++ b/gas/testsuite/gas/cris/rd-mulbug-1.d
@@ -1,6 +1,6 @@
 #objdump: -s
 #source: mulbug-err-1.s
-#as: --em=criself --no-mul-bug-abort
+#as: --emulation=criself --no-mul-bug-abort
 
 # Check that we don't get any errors or messages with
 # "--no-mul-bug-abort".  No checking for "--mul-bug-abort",

diff --git a/gas/testsuite/gas/cris/rd-pcplus.d b/gas/testsuite/gas/cris/rd-pcplus.d
index 7cbd2aed19715c36fcd0f99d4996d6552a1cba4c..db8bd155d22e32a5d23d42e220ee6c63e4424294 100644 (file)
--- a/gas/testsuite/gas/cris/rd-pcplus.d
+++ b/gas/testsuite/gas/cris/rd-pcplus.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v10 --underscore
+#as: --emulation=criself --march=v10 --underscore
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-pcrel2.d b/gas/testsuite/gas/cris/rd-pcrel2.d
index 2b401e7a0f122237d153ef40942aa4f172f662ca..1972b37bacbd403aa235a4e46e7e33aef50a85c5 100644 (file)
--- a/gas/testsuite/gas/cris/rd-pcrel2.d
+++ b/gas/testsuite/gas/cris/rd-pcrel2.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --em=criself
+#as: --emulation=criself
 
 .*:     file format .*-cris
 

diff --git a/gas/testsuite/gas/cris/rd-pic-1.d b/gas/testsuite/gas/cris/rd-pic-1.d
index aab93a5d502a3e47096a999c4b56b0cdd1b92d43..c180dd2d2da522196d1ef05c69565c8adf72fca6 100644 (file)
--- a/gas/testsuite/gas/cris/rd-pic-1.d
+++ b/gas/testsuite/gas/cris/rd-pic-1.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --em=criself --pic
+#as: --emulation=criself --pic
 #name: PIC relocs.
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-pic-2.d b/gas/testsuite/gas/cris/rd-pic-2.d
index ce75451cd11648def317a49d56c34e5fb95b2227..7c6da568c8bb2fff23fe9e1aaba7edd03466b81e 100644 (file)
--- a/gas/testsuite/gas/cris/rd-pic-2.d
+++ b/gas/testsuite/gas/cris/rd-pic-2.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --underscore --em=criself --pic
+#as: --underscore --emulation=criself --pic
 
 # Check that 16-bit PIC relocs aren't overflowing.
 # PR gas/1049.

diff --git a/gas/testsuite/gas/cris/rd-ppv1032.d b/gas/testsuite/gas/cris/rd-ppv1032.d
index 4f64ce1938f7f7129508e3b4bc85fa7967336fdd..1a5bd50c39d72cc1c4ebfed774ababbadc3c467f 100644 (file)
--- a/gas/testsuite/gas/cris/rd-ppv1032.d
+++ b/gas/testsuite/gas/cris/rd-ppv1032.d
@@ -1,5 +1,5 @@
 #source: pushpopv32.s
-#as: --underscore --march=common_v10_v32 --em=criself
+#as: --underscore --march=common_v10_v32 --emulation=criself
 #objdump: -dr
 
 .*:[   ]+file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-ppv32.d b/gas/testsuite/gas/cris/rd-ppv32.d
index 52355ffe228f990d6e2095cb7b3fa21bc9d20ccf..e512e6ca0bd6c56ebc82955369003a8e945a87ed 100644 (file)
--- a/gas/testsuite/gas/cris/rd-ppv32.d
+++ b/gas/testsuite/gas/cris/rd-ppv32.d
@@ -1,5 +1,5 @@
 #source: pushpopv32.s
-#as: --underscore --march=v32 --em=criself
+#as: --underscore --march=v32 --emulation=criself
 #objdump: -dr
 
 .*:[   ]+file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-regprefix-1b.d b/gas/testsuite/gas/cris/rd-regprefix-1b.d
index 2c3a625f28704ffc01146f4371d779625b39ff2f..ca588b735cc940d7086bed0bbe05f0a79ad99091 100644 (file)
--- a/gas/testsuite/gas/cris/rd-regprefix-1b.d
+++ b/gas/testsuite/gas/cris/rd-regprefix-1b.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #source: rd-regprefix-1.s
 #name: Register prefixes 1 defaulted to yes.
 

diff --git a/gas/testsuite/gas/cris/rd-spr-1.d b/gas/testsuite/gas/cris/rd-spr-1.d
index a7f28c70f5684367ec7821d29b31ba27d22d5d54..fc5417eb75946d944ec36ea9d9b0423623742ccf 100644 (file)
--- a/gas/testsuite/gas/cris/rd-spr-1.d
+++ b/gas/testsuite/gas/cris/rd-spr-1.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 # Check support for support function register names.

diff --git a/gas/testsuite/gas/cris/rd-tls-1.d b/gas/testsuite/gas/cris/rd-tls-1.d
index aec9c50a73bb82c20a8cdf6c25b3e3e6f2bf8d8d..2d25aca7b9a95c15ee9c4954069b3fc858de2c5a 100644 (file)
--- a/gas/testsuite/gas/cris/rd-tls-1.d
+++ b/gas/testsuite/gas/cris/rd-tls-1.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --em=criself
+#as: --emulation=criself
 #name: TLS non-PIC relocs.
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-tls-2.d b/gas/testsuite/gas/cris/rd-tls-2.d
index c68638149eb0a6e7e97cda1022cbf044fcacfab7..0882160755b6368119c98f3ec82039b073de28c8 100644 (file)
--- a/gas/testsuite/gas/cris/rd-tls-2.d
+++ b/gas/testsuite/gas/cris/rd-tls-2.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --em=criself --pic
+#as: --emulation=criself --pic
 #name: TLS PIC relocs.
 
 .*:     file format .*-cris

diff --git a/gas/testsuite/gas/cris/rd-usp-1b.d b/gas/testsuite/gas/cris/rd-usp-1b.d
index 40a92fe05412ab07a0f9e5dd5b1f5ad69cfa27b3..9da67768e4aa7b02832074251c3e6f93cd5f9ec3 100644 (file)
--- a/gas/testsuite/gas/cris/rd-usp-1b.d
+++ b/gas/testsuite/gas/cris/rd-usp-1b.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --underscore --march=v32 --em=criself
+#as: --underscore --march=v32 --emulation=criself
 #source: v32-err-8.s
 
 # Check that USP gets the right number for V32.

diff --git a/gas/testsuite/gas/cris/rd-v10_32o-1.d b/gas/testsuite/gas/cris/rd-v10_32o-1.d
index d9f43531a6b740acb2652cb71d33831c9301804b..61c002773903b308bf44617ea5edd8f6c29ff1a1 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v10_32o-1.d
+++ b/gas/testsuite/gas/cris/rd-v10_32o-1.d
@@ -1,5 +1,5 @@
 #source: break.s
-#as: --underscore --em=criself --march=common_v10_v32
+#as: --underscore --emulation=criself --march=common_v10_v32
 #objdump: -p
 
 # Check that different command-line options result in different

diff --git a/gas/testsuite/gas/cris/rd-v10_32o-2.d b/gas/testsuite/gas/cris/rd-v10_32o-2.d
index 73c240f13b02e4b1d98007834c318d762b2b83e9..2a695a99def3ea141474f9862274b9ad3ef63d94 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v10_32o-2.d
+++ b/gas/testsuite/gas/cris/rd-v10_32o-2.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=common_v10_v32
+#as: --underscore --emulation=criself --march=common_v10_v32
 #objdump: -dr
 
 # Check that branch offsets are computed as for v32.  The

diff --git a/gas/testsuite/gas/cris/rd-v32-b1.d b/gas/testsuite/gas/cris/rd-v32-b1.d
index 52823994de89103f3c46a5f00bad2068d7d0046b..2ded58befdf024c6238451ad61e7a9e377439fe7 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-b1.d
+++ b/gas/testsuite/gas/cris/rd-v32-b1.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-v32-b2.d b/gas/testsuite/gas/cris/rd-v32-b2.d
index 9439b9e8591e5d59b93236afd9aa46e6881a1c90..e7fa79695d211b09c4a8f2cbe905c9be9bccc03d 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-b2.d
+++ b/gas/testsuite/gas/cris/rd-v32-b2.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-v32-b3.d b/gas/testsuite/gas/cris/rd-v32-b3.d
index fee75df97c64743c48354b3f77f732fb754f96c1..6b7d18374a3f24de1b3be75022bc3ed5f2a719bd 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-b3.d
+++ b/gas/testsuite/gas/cris/rd-v32-b3.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 # Check expansion of "ba" into dword operands for different segment.

diff --git a/gas/testsuite/gas/cris/rd-v32-f1.d b/gas/testsuite/gas/cris/rd-v32-f1.d
index d97c38e3b62c77d4be0e1c0d5af4363ad67c99eb..fa69a703aa06ea44df79d4d1a8e3264f6ac6cd79 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-f1.d
+++ b/gas/testsuite/gas/cris/rd-v32-f1.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 # Test that v32 flags are properly recognized and emitted at disassembly.

diff --git a/gas/testsuite/gas/cris/rd-v32-i1.d b/gas/testsuite/gas/cris/rd-v32-i1.d
index def1e49900f8eceeb6412c2da2c03b96fe7157d3..75d490d7f9f5c8fe65f787e20c5d80de72117c39 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-i1.d
+++ b/gas/testsuite/gas/cris/rd-v32-i1.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 # Test that addc recognizes constant operands.

diff --git a/gas/testsuite/gas/cris/rd-v32-l1.d b/gas/testsuite/gas/cris/rd-v32-l1.d
index 231f0e7ac5e340528dfd53b945746010baba5bd5..72a8c6edc7f924a7ee60dde91a4241d23b3f2f86 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-l1.d
+++ b/gas/testsuite/gas/cris/rd-v32-l1.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-v32-l3.d b/gas/testsuite/gas/cris/rd-v32-l3.d
index 59a8174419b49bda2399d852db45e5d24945ad1a..33b369d3db6657d86d9e3e2c2dc4e6e12852cdae 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-l3.d
+++ b/gas/testsuite/gas/cris/rd-v32-l3.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-v32-l4.d b/gas/testsuite/gas/cris/rd-v32-l4.d
index 4afd3fb9a93a75eaeaa49adfcefaec09c30bc84b..f7af48b9b69d9bcfdf0069a6e9713a2c2c02bd68 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32-l4.d
+++ b/gas/testsuite/gas/cris/rd-v32-l4.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 # Test that lapc shrinks to lapcq and that offsets are emitted correctly.

diff --git a/gas/testsuite/gas/cris/rd-v32o-1.d b/gas/testsuite/gas/cris/rd-v32o-1.d
index 24bfcda1170046ea464a09519f175b7eeeaff4cf..0cae6802e2d49b00f284d5e6596ddb5a4d80708f 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32o-1.d
+++ b/gas/testsuite/gas/cris/rd-v32o-1.d
@@ -1,5 +1,5 @@
 #source: abs32-1.s
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -p
 
 # Check that different command-line options result in different

diff --git a/gas/testsuite/gas/cris/rd-v32s-1.d b/gas/testsuite/gas/cris/rd-v32s-1.d
index b4f85be8c4d5d538f64dca740d7b29de63ff9edf..dbfad959ae64b2f57ac32e3d72e12aa0d3e111b8 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32s-1.d
+++ b/gas/testsuite/gas/cris/rd-v32s-1.d
@@ -1,5 +1,5 @@
 #source: v32-err-1.s
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 # Check that v32 insns that are expected to give syntax errors

diff --git a/gas/testsuite/gas/cris/rd-v32s-2.d b/gas/testsuite/gas/cris/rd-v32s-2.d
index 446cadc2915588d4f0e38fe16ed8e486a02fa38f..6c55456dc03778634642db8510c83553e5a1a86e 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32s-2.d
+++ b/gas/testsuite/gas/cris/rd-v32s-2.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-v32s-3.d b/gas/testsuite/gas/cris/rd-v32s-3.d
index 27d75aa6dc54ca1096f0bbcd1abcd73d9aa99d0b..bae8858993327729f34da9d389393fd9ad6fe879 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32s-3.d
+++ b/gas/testsuite/gas/cris/rd-v32s-3.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-v32s-4.d b/gas/testsuite/gas/cris/rd-v32s-4.d
index 516dcc8a1c52bab0a0b3b645584db07fd5731613..9bd6dcd55ba99f17af57c0f1e856609797172b9d 100644 (file)
--- a/gas/testsuite/gas/cris/rd-v32s-4.d
+++ b/gas/testsuite/gas/cris/rd-v32s-4.d
@@ -1,4 +1,4 @@
-#as: --underscore --em=criself --march=v32
+#as: --underscore --emulation=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris

diff --git a/gas/testsuite/gas/cris/rd-vao-1.d b/gas/testsuite/gas/cris/rd-vao-1.d
index 14b68bdd0ca86b652634b394b28487e5ea541b53..dfdc7dce9b35f69645a2612ba11fd1ad837bc98e 100644 (file)
--- a/gas/testsuite/gas/cris/rd-vao-1.d
+++ b/gas/testsuite/gas/cris/rd-vao-1.d
@@ -1,5 +1,5 @@
 #source: abs32-1.s
-#as: --underscore --em=criself --march=v0_v10
+#as: --underscore --emulation=criself --march=v0_v10
 #objdump: -p
 
 # Check that different command-line options result in different

diff --git a/gas/testsuite/gas/cris/tls-err-1.s b/gas/testsuite/gas/cris/tls-err-1.s
index d4fd8d47cbcbb684ca36e64ade00e6510a936251..3194e2ddba8f95f3e486640ff7514264c83884d1 100644 (file)
--- a/gas/testsuite/gas/cris/tls-err-1.s
+++ b/gas/testsuite/gas/cris/tls-err-1.s
@@ -1,7 +1,7 @@
 ; Like pic-err-1.s but for non-pic TLS suffixes.
 
 ; { dg-do assemble }
-; { dg-options "--no-underscore --em=criself" }
+; { dg-options "--no-underscore --emulation=criself" }
 
  .syntax no_register_prefix
  .text

diff --git a/gas/testsuite/gas/cris/tls-err-2.s b/gas/testsuite/gas/cris/tls-err-2.s
index d320651421a62606093d144357baee6fb890092d..c37df02b4d0e6f601abea2df6514c1a5ef2a437c 100644 (file)
--- a/gas/testsuite/gas/cris/tls-err-2.s
+++ b/gas/testsuite/gas/cris/tls-err-2.s
@@ -1,7 +1,7 @@
 ; Like tls-err-1.s but for PIC TLS suffixes.
 
 ; { dg-do assemble }
-; { dg-options "--pic --no-underscore --em=criself" }
+; { dg-options "--pic --no-underscore --emulation=criself" }
 
  .syntax no_register_prefix
  .text

diff --git a/gas/testsuite/gas/cris/tls-err-3.s b/gas/testsuite/gas/cris/tls-err-3.s
index cbc2b5da5135f6d167b013fdc259218363929aeb..1eaa563398e4186df3bda7fae6301299d02306ab 100644 (file)
--- a/gas/testsuite/gas/cris/tls-err-3.s
+++ b/gas/testsuite/gas/cris/tls-err-3.s
@@ -1,7 +1,7 @@
 ; Check that TLS PIC suffixes aren't accepted when non-PIC.
 
 ; { dg-do assemble }
-; { dg-options "--no-underscore --em=criself" }
+; { dg-options "--no-underscore --emulation=criself" }
 
  .syntax no_register_prefix
  .text

diff --git a/gas/testsuite/gas/cris/us-err-1.s b/gas/testsuite/gas/cris/us-err-1.s
index cbe7618910a5da1701dbcc249f95687313b57fa7..a13d4c1b4ab21f8bf9abe8dcd9c97d2c1ef2fec4 100644 (file)
--- a/gas/testsuite/gas/cris/us-err-1.s
+++ b/gas/testsuite/gas/cris/us-err-1.s
@@ -1,7 +1,7 @@
 ; Test that we get an error with mismatching options.
 
 ; { dg-do assemble }
-; { dg-options "--no-underscore --em=crisaout" }
+; { dg-options "--no-underscore --emulation=crisaout" }
 ; { dg-error ".* --no-underscore is invalid with a.out format" "" { target cris-*-* } 0 }
 
 start:

diff --git a/gas/testsuite/gas/cris/us-err-3.s b/gas/testsuite/gas/cris/us-err-3.s
index 54ff9f3037b1767858a4595c6470b487b039a09e..61431ae3bd54e1ab551a4a495d3c98e5faeeb4c9 100644 (file)
--- a/gas/testsuite/gas/cris/us-err-3.s
+++ b/gas/testsuite/gas/cris/us-err-3.s
@@ -3,7 +3,7 @@
 ; a.out.
 
 ; { dg-do assemble }
-; { dg-options "--no-underscore --em=criself" }
+; { dg-options "--no-underscore --emulation=criself" }
 
        .syntax leading_underscore ; { dg-error ".* \.syntax leading_underscore requires .* `--underscore'" }
 start:

diff --git a/gas/testsuite/gas/cris/v32-err-2.s b/gas/testsuite/gas/cris/v32-err-2.s
index 0a5a3767f3edc41d9ec022b00878240dd7c30930..59bf4996cdaefc3f2dbd0d2df4a4f4b656bff038 100644 (file)
--- a/gas/testsuite/gas/cris/v32-err-2.s
+++ b/gas/testsuite/gas/cris/v32-err-2.s
@@ -1,5 +1,5 @@
 ; { dg-do assemble }
-; { dg-options " --underscore --march=common_v10_v32 --em=criself" }
+; { dg-options " --underscore --march=common_v10_v32 --emulation=criself" }
 ; { dg-error ".word offset handling is not implemented" "err for broken .word" { target cris-*-* } 0 }
 
 ; Tests that broken words don't crash, just give a message when

diff --git a/gas/testsuite/gas/cris/v32-err-7.s b/gas/testsuite/gas/cris/v32-err-7.s
index 72b65033cdc6428321cb7f921529e75d03ff5eb0..4f13d88928cc97cfcb4f29af85f74d2824337cfd 100644 (file)
--- a/gas/testsuite/gas/cris/v32-err-7.s
+++ b/gas/testsuite/gas/cris/v32-err-7.s
@@ -1,6 +1,6 @@
 ; Error for lapcq out-of-range.
 ; { dg-do assemble }
-; { dg-options "--march=v32 --em=criself" }
+; { dg-options "--march=v32 --emulation=criself" }
 
 a:
  nop

diff --git a/ld/testsuite/ld-cris/asneed1.d b/ld/testsuite/ld-cris/asneed1.d
index 00fba758223f37f21b52f0ce1d65e75932caa2de..b40356de53f0b739d10f499f163d24c33e6be278 100644 (file)
--- a/ld/testsuite/ld-cris/asneed1.d
+++ b/ld/testsuite/ld-cris/asneed1.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: dso-2.s
 #source: dso-1.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux --as-needed tmpdir/libdso-1.so
 #objdump: -p
 

diff --git a/ld/testsuite/ld-cris/badgotr1.d b/ld/testsuite/ld-cris/badgotr1.d
index f7a5ac84654372a0b0f09959c4953d3e5bd6fe20..a993e90f90b4baddb4efc0685b04c8f422f05b5c 100644 (file)
--- a/ld/testsuite/ld-cris/badgotr1.d
+++ b/ld/testsuite/ld-cris/badgotr1.d
@@ -1,5 +1,5 @@
 #source: gotrel1.s
-#as: --pic --underscore --em=criself
+#as: --pic --underscore --emulation=criself
 #ld: -m crislinux -shared
 #objdump: -dr
 #error: \A[^\nc][^\n]*o: uses _-prefixed [^\nc]*\n[^\nc][^\n]* failed to merge [^\n]*\n[^\nc][^\n]* no GOT [^\n]*\n[^\nc][^\n]* bad value\Z

diff --git a/ld/testsuite/ld-cris/def2.d b/ld/testsuite/ld-cris/def2.d
index ff75d88a123348f577601ba38f991418434ce697..00c5f4182f8c3995f02c8089d5e6dfd3d75290bb 100644 (file)
--- a/ld/testsuite/ld-cris/def2.d
+++ b/ld/testsuite/ld-cris/def2.d
@@ -2,7 +2,7 @@
 #source: stabs1.s
 #source: globsymw1.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=crisaout
+#as: --emulation=crisaout
 #ld: -mcrisaout
 #objdump: -p
 # Just checking that undef2 links correctly when given a symbol.

diff --git a/ld/testsuite/ld-cris/def3.d b/ld/testsuite/ld-cris/def3.d
index e1ae3c5eb2ed6c413ee218a21908559cc3ccc892..231414b8186e7d79607cce287460895adbfef0f1 100644 (file)
--- a/ld/testsuite/ld-cris/def3.d
+++ b/ld/testsuite/ld-cris/def3.d
@@ -2,7 +2,7 @@
 #source: stabs1.s
 #source: globsymw1.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=criself
+#as: --emulation=criself
 #ld: -mcriself
 #objdump: -p
 # Just checking that undef3 links correctly when given a symbol.

diff --git a/ld/testsuite/ld-cris/dso-pltdis1.d b/ld/testsuite/ld-cris/dso-pltdis1.d
index efc4d94aaf600cadae43f60d23be592b9033a525..96140338bc2babcdc5b79cc1176060805375de1b 100644 (file)
--- a/ld/testsuite/ld-cris/dso-pltdis1.d
+++ b/ld/testsuite/ld-cris/dso-pltdis1.d
@@ -1,7 +1,7 @@
 #source: dsov32-1.s
 #source: dsov32-2.s
 #source: dsofn4g.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -d -R
 

diff --git a/ld/testsuite/ld-cris/dso-pltdis2.d b/ld/testsuite/ld-cris/dso-pltdis2.d
index c6f53fd26eac983564fed38d1ba93323daf4fa2b..e9673868514df640671c8d6a86729eaba3ba26e9 100644 (file)
--- a/ld/testsuite/ld-cris/dso-pltdis2.d
+++ b/ld/testsuite/ld-cris/dso-pltdis2.d
@@ -1,7 +1,7 @@
 #source: dsov32-1.s
 #source: dsov32-2.s
 #source: dsofng.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -d 
 

diff --git a/ld/testsuite/ld-cris/dso12-pltdis.d b/ld/testsuite/ld-cris/dso12-pltdis.d
index 429f91e2d193eb597cd56a48a85ab8f331d0ce86..e5a230c6daec5a30c650f0f00ce79cb52eb60116 100644 (file)
--- a/ld/testsuite/ld-cris/dso12-pltdis.d
+++ b/ld/testsuite/ld-cris/dso12-pltdis.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: dsov32-1.s
 #source: dsov32-2.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -d 
 

diff --git a/ld/testsuite/ld-cris/expdyn1.d b/ld/testsuite/ld-cris/expdyn1.d
index 37cbe4dce9c41faa49a9944d67122c9c14db5d2b..0c1ea55bedd7c3a4bd9d4eed6135b034697e5481 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn1.d
+++ b/ld/testsuite/ld-cris/expdyn1.d
@@ -1,5 +1,5 @@
 #source: expdyn1.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux -export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/expdyn2.d b/ld/testsuite/ld-cris/expdyn2.d
index 6c5faa5991bdf2c6b9d6f2b3101bf87fc2a20d41..b2a6fb3de55db400ba29d6fea74fe120f240f36a 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn2.d
+++ b/ld/testsuite/ld-cris/expdyn2.d
@@ -1,6 +1,6 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
 #objdump: -R
 

diff --git a/ld/testsuite/ld-cris/expdyn3.d b/ld/testsuite/ld-cris/expdyn3.d
index 34f2a5efeae5894b22a1579cb94c15c0dd5557c4..aefbe84f3361b04cf4b99b94e7390d5b18975dbe 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn3.d
+++ b/ld/testsuite/ld-cris/expdyn3.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #source: euwref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
 #objdump: -R
 

diff --git a/ld/testsuite/ld-cris/expdyn4.d b/ld/testsuite/ld-cris/expdyn4.d
index e93205669a1f9c30ad196ca9b50b65ab2dcbd86c..551014230019927d4ce601a51afccde821950c7e 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn4.d
+++ b/ld/testsuite/ld-cris/expdyn4.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #source: comref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
 #objdump: -R
 

diff --git a/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d
index 818ee4f5bae07dc2407d275311e8b36fa055558c..0c4dfd0d1b3c908044d1f333a1c2782bc0802b76 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn5.d
+++ b/ld/testsuite/ld-cris/expdyn5.d
@@ -1,6 +1,6 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 

diff --git a/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d
index cf4a5783260c8dd3c3937a31c10f440c7632031c..c315d953e81643c14a93776c8523c045c7f74f03 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn6.d
+++ b/ld/testsuite/ld-cris/expdyn6.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #source: euwref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 

diff --git a/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d
index 6028343a4f3b9a907575f814693b87c4f61a29e1..a5d52d19ecb0644e6e405504c67a77ecdbf33773 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn7.d
+++ b/ld/testsuite/ld-cris/expdyn7.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #source: comref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --export-dynamic tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 

diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index 163bb018d348467a4a8aa6c01943d92dd61a025b..96ea5e167e1aba20f8606bbb5c54148c03b386ed 100644 (file)
--- a/ld/testsuite/ld-cris/gotplt1.d
+++ b/ld/testsuite/ld-cris/gotplt1.d
@@ -1,7 +1,7 @@
 #source: dso-2.s
 #source: dsofnf2.s
 #source: gotrel1.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -sR
 

diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index 32d0f89db35b4ea74ecece31743cf883585119e0..32c515fbb15f8e51f152f5f334ec49dd9b907748 100644 (file)
--- a/ld/testsuite/ld-cris/gotplt2.d
+++ b/ld/testsuite/ld-cris/gotplt2.d
@@ -1,7 +1,7 @@
 #source: dso-2.s
 #source: dsofnf.s
 #source: gotrel1.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -sR
 

diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index abc0192c3fcc9eda414ff1455d9b75780cbea3c2..7dd85627d3a505af35768d8a598f3d729c5f50c9 100644 (file)
--- a/ld/testsuite/ld-cris/gotplt3.d
+++ b/ld/testsuite/ld-cris/gotplt3.d
@@ -2,7 +2,7 @@
 #source: dsofnf.s
 #source: gotrel1.s
 #source: dso-1.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -sR
 

diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index 602f1bfe461d20da65a289b83757f8cdfefb3562..7cbe876bf62b3484f151b166e52cb1c7eef81d3a 100644 (file)
--- a/ld/testsuite/ld-cris/hiddef1.d
+++ b/ld/testsuite/ld-cris/hiddef1.d
@@ -2,7 +2,7 @@
 #source: hiddef1.s
 #source: hidrefgotplt1.s
 #ld: -shared -m crislinux --hash-style=sysv
-#as: --pic --no-underscore -I$srcdir/$subdir --em=criself
+#as: --pic --no-underscore -I$srcdir/$subdir --emulation=criself
 #readelf: -S -s -r
 
 # Regression test for mishandling of GOTPLT relocs against a

diff --git a/ld/testsuite/ld-cris/ldsym1.d b/ld/testsuite/ld-cris/ldsym1.d
index e8dcd325e0e02639f8f10f1df6c2d313bd7b9754..2aacf3acc2a873708096b626654238e33d4e8fe8 100644 (file)
--- a/ld/testsuite/ld-cris/ldsym1.d
+++ b/ld/testsuite/ld-cris/ldsym1.d
@@ -1,6 +1,6 @@
 # source: expdyn1.s
 # target: cris-*-*elf* cris-*-*aout*
-# as: --em=criself
+# as: --emulation=criself
 # ld: -mcriself
 # objdump: -d
 

diff --git a/ld/testsuite/ld-cris/libdso-1.d b/ld/testsuite/ld-cris/libdso-1.d
index 5a7e9a165496991f103558ea3cfc0cd861e92ce6..ba5d3b0bd72304ebe4ce15e3b1dc55fcf79ba094 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-1.d
+++ b/ld/testsuite/ld-cris/libdso-1.d
@@ -1,5 +1,5 @@
 #source: dso-1.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
index 0f0d56264bf3075230606369b1a7a66d596261f0..696b16e09e4fe80c7865b4df6b88285b83efb271 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-10.d
+++ b/ld/testsuite/ld-cris/libdso-10.d
@@ -1,5 +1,5 @@
 #source: dso-1.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -p -h
 

diff --git a/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
index 0e00ad6e70a8cbfddbaee03073b49eba3b04817e..f95ca4fbeeaca4858ba96083d305d0e00fb2addd 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-11.d
+++ b/ld/testsuite/ld-cris/libdso-11.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: dsov32-1.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -T
 

diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index 7fe83427be045cc7cf4f9b38ba74c45c7b9fbf0b..1bf459644f936bbfa082ca7793a3053dd6bd2fde 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-12.d
+++ b/ld/testsuite/ld-cris/libdso-12.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: dsov32-1.s
 #source: dsov32-2.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -s -T
 

diff --git a/ld/testsuite/ld-cris/libdso-12b.d b/ld/testsuite/ld-cris/libdso-12b.d
index 215d1886c354efd69afecce9af388bd59adedf74..a133f1132d97dd70bc390663b7aec206c1e5d44e 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-12b.d
+++ b/ld/testsuite/ld-cris/libdso-12b.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: dsov32-1.s
 #source: dsov32-2.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -T
 

diff --git a/ld/testsuite/ld-cris/libdso-12c.d b/ld/testsuite/ld-cris/libdso-12c.d
index 949a0e7c103e8ac8372d306f8f4a08586f36983d..484630ea525fdcfa14217bb069be11adb7f50188 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-12c.d
+++ b/ld/testsuite/ld-cris/libdso-12c.d
@@ -2,7 +2,7 @@
 #source: dsov32-1.s
 #source: dsov32-2.s
 #source: dso-1.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468 --hash-style=sysv
 #objdump: -s -T
 

diff --git a/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
index b50a5afc97cdd417d187d8bbcb469e15c8cb19e0..ad320190e2175cef95e4e9dfa12e2035759a0141 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-13.d
+++ b/ld/testsuite/ld-cris/libdso-13.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: dsov32-3.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #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 cf8200e3c1c10c179b30c23ece1bcda94cecc397..b592a9c3ba1de45bd4620455f8b94c64160f5782 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-13b.d
+++ b/ld/testsuite/ld-cris/libdso-13b.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: dsov32-3.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468 --hash-style=sysv
 #readelf: -d -r
 

diff --git a/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
index b87a5cec83ff3932a035eba17e9cf4e480364538..ce4b8adb90fcf94211481e6f3babc67599dad401 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-14.d
+++ b/ld/testsuite/ld-cris/libdso-14.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: dsov32-4.s
-#as: --pic --no-underscore --march=v32 --em=criself
+#as: --pic --no-underscore --march=v32 --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #readelf: -d -r
 

diff --git a/ld/testsuite/ld-cris/libdso-15.d b/ld/testsuite/ld-cris/libdso-15.d
index e772fa37d247131f858c485aeef416c01bcf2157..6f9b5752945d7cc641a9f0f105067779a838436f 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-15.d
+++ b/ld/testsuite/ld-cris/libdso-15.d
@@ -1,5 +1,5 @@
 #source: expdyn2.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --version-script $srcdir/$subdir/expalltst3 --hash-style=sysv
 #objdump: -s -T
 

diff --git a/ld/testsuite/ld-cris/libdso-15b.d b/ld/testsuite/ld-cris/libdso-15b.d
index d02619bd7bc6b2cf1e41a81ba9afa6a0244a27dd..161a58e6611445c404aa2e8a083567ad9dcaa6aa 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-15b.d
+++ b/ld/testsuite/ld-cris/libdso-15b.d
@@ -1,5 +1,5 @@
 #source: expdref2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #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-15c.d b/ld/testsuite/ld-cris/libdso-15c.d
index b0359905c24c8ae59d4ed8661437d81504af91bf..3adb95296572790cea12e7daa555fb1194213f51 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-15c.d
+++ b/ld/testsuite/ld-cris/libdso-15c.d
@@ -1,5 +1,5 @@
 #source: expdref2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-15.so
 #readelf: -d

diff --git a/ld/testsuite/ld-cris/libdso-1b.d b/ld/testsuite/ld-cris/libdso-1b.d
index 56e578855753efd12dd8752594da76f4b844cbc6..6d88e1398dd56244ff5e62e9782c3b96d24627c2 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-1b.d
+++ b/ld/testsuite/ld-cris/libdso-1b.d
@@ -1,5 +1,5 @@
 #source: dso-1b.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --version-script $srcdir/$subdir/hidedsofns2468 --hash-style=sysv
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/libdso-1c.d b/ld/testsuite/ld-cris/libdso-1c.d
index d69b857c531b1df2e7d6f3ef9e5867e1fe15bce8..218f296a17c90736eed0815398fafcc83ff6c3e8 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-1c.d
+++ b/ld/testsuite/ld-cris/libdso-1c.d
@@ -1,5 +1,5 @@
 #source: expdref1.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #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 83a43372edb28a3fe78d70962593cb189901da7b..7755b0e2c5aba4b14612ba2094ba9adbd1f06ee0 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-1d.d
+++ b/ld/testsuite/ld-cris/libdso-1d.d
@@ -1,6 +1,6 @@
 #source: expdref1.s
 #source: expdyn1w.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #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-2.d b/ld/testsuite/ld-cris/libdso-2.d
index 900d00d8c2462a5700481746b1d832fd37a1d396..7133dd53d26017782585444822f07cb881e9aea7 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: dso-2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv --version-script $srcdir/$subdir/hide1
 #readelf: -S -s -r
 

diff --git a/ld/testsuite/ld-cris/libdso-3.d b/ld/testsuite/ld-cris/libdso-3.d
index 9e18c59e1abeb25e1e802bc0426766f21ec5284a..c02eb3d63fd1bc5d911196293e78292252084078 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-3.d
+++ b/ld/testsuite/ld-cris/libdso-3.d
@@ -1,6 +1,6 @@
 #source: expdyn1.s
 #source: dso-3.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #objdump: -R
 

diff --git a/ld/testsuite/ld-cris/libdso-4.d b/ld/testsuite/ld-cris/libdso-4.d
index 3d573951e1a1d367ac3651adbe7950c465d2d1eb..11a85a121d9f2dfe2b66d1af68629f0818c0abe1 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-4.d
+++ b/ld/testsuite/ld-cris/libdso-4.d
@@ -1,5 +1,5 @@
 #source: dso-2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/locref1.d b/ld/testsuite/ld-cris/locref1.d
index ac26b28ea4ef9e29a8295e741875f6e402b3953c..da5d86ce4aef75444fdd79aaf2a55ebb014c31c2 100644 (file)
--- a/ld/testsuite/ld-cris/locref1.d
+++ b/ld/testsuite/ld-cris/locref1.d
@@ -1,4 +1,4 @@
-#as: --no-underscore --pic --em=criself
+#as: --no-underscore --pic --emulation=criself
 #source: expdyn1.s
 #source: locref1.s
 #ld: -m crislinux

diff --git a/ld/testsuite/ld-cris/locref2.d b/ld/testsuite/ld-cris/locref2.d
index 0cf53946cb569a1ead161d78e0d3c36fd9f5ab3b..4f8712b419a8d153a880a42a6cd5c212d56d9429 100644 (file)
--- a/ld/testsuite/ld-cris/locref2.d
+++ b/ld/testsuite/ld-cris/locref2.d
@@ -1,4 +1,4 @@
-#as: --no-underscore --pic --em=criself
+#as: --no-underscore --pic --emulation=criself
 #source: gotrel1.s
 #source: locref2.s
 #ld: -m crislinux

diff --git a/ld/testsuite/ld-cris/nodyn4.d b/ld/testsuite/ld-cris/nodyn4.d
index c1af092bf6e38f3448c06006bcc20d0dc90d788b..9a20173dfa4581ef9a3b5e14833b9ea453ec6bee 100644 (file)
--- a/ld/testsuite/ld-cris/nodyn4.d
+++ b/ld/testsuite/ld-cris/nodyn4.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #source: comref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #readelf: -l
 

diff --git a/ld/testsuite/ld-cris/nodyn5.d b/ld/testsuite/ld-cris/nodyn5.d
index 28b581e097b4cf21af6c7629252cbb00294384d9..0130fa566a9942b228388e09c28ce3820ced64f5 100644 (file)
--- a/ld/testsuite/ld-cris/nodyn5.d
+++ b/ld/testsuite/ld-cris/nodyn5.d
@@ -1,7 +1,7 @@
 #source: expdyn1.s
 #source: expdref1.s --pic
 #source: comref1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -s -j .got
 

diff --git a/ld/testsuite/ld-cris/pcrelcp-1.d b/ld/testsuite/ld-cris/pcrelcp-1.d
index 0d5f6b8ae9ce66b7d9f2efb0013befff6fb1737b..7152308cfbd27c8b962e713d1df3ad2f0922248f 100644 (file)
--- a/ld/testsuite/ld-cris/pcrelcp-1.d
+++ b/ld/testsuite/ld-cris/pcrelcp-1.d
@@ -1,4 +1,4 @@
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -shared -m crislinux -z nocombreloc
 #ld_after_inputfiles: tmpdir/libdso-1b.so
 #warning: \A[^\n]*\.o, section `.text', to symbol `expfn@@TST2':[^\n]*recompile with -fPIC\Z

diff --git a/ld/testsuite/ld-cris/pic-gc-72.d b/ld/testsuite/ld-cris/pic-gc-72.d
index 3c096eab3fc47198f0093ceab83e87cbf420336b..269a5d2033fe77ce443acc11b2971822e55fb826 100644 (file)
--- a/ld/testsuite/ld-cris/pic-gc-72.d
+++ b/ld/testsuite/ld-cris/pic-gc-72.d
@@ -1,7 +1,7 @@
 #source: pic-gc-72.s
 #source: expdref1.s
 #source: expdyn1.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --gc-sections --hash-style=sysv
 #objdump: -s -t -R -p -T
 

diff --git a/ld/testsuite/ld-cris/pic-gc-73.d b/ld/testsuite/ld-cris/pic-gc-73.d
index 603ce4559fe188af1638d28cedcbb1d6f643f0ac..bafe4839c5bdd454d406c6a7e5f372294018b344 100644 (file)
--- a/ld/testsuite/ld-cris/pic-gc-73.d
+++ b/ld/testsuite/ld-cris/pic-gc-73.d
@@ -1,6 +1,6 @@
 #source: pic-gc-73.s
 #source: expdyn1.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --gc-sections --hash-style=sysv
 #objdump: -s -t -R -p -T
 

diff --git a/ld/testsuite/ld-cris/pr16044.d b/ld/testsuite/ld-cris/pr16044.d
index 9bb264b881d7197f35d3facd4abcac420cf87105..59e90bb2699b12a59769270355be3b6b3b5083e2 100644 (file)
--- a/ld/testsuite/ld-cris/pr16044.d
+++ b/ld/testsuite/ld-cris/pr16044.d
@@ -1,7 +1,7 @@
 #source: dso-4.s
 #source: dso-2b.s
 #source: dso-1c.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --hash-style=sysv
 #readelf: -s -r
 

diff --git a/ld/testsuite/ld-cris/pr26589.d b/ld/testsuite/ld-cris/pr26589.d
index aee31434ca233e122ac5839b6b9db7b7fe9912fe..17da49a00a6203059f78a4a1fd107bd08ea0fb3f 100644 (file)
--- a/ld/testsuite/ld-cris/pr26589.d
+++ b/ld/testsuite/ld-cris/pr26589.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: locref3.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #readelf: --dyn-syms -r
 

diff --git a/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
index 3b17e2352a782e034dbed4c31d72c7de4e307cd4..0d9a9241d034594f4e589421391061ed05c449e2 100644 (file)
--- a/ld/testsuite/ld-cris/pv32-1.d
+++ b/ld/testsuite/ld-cris/pv32-1.d
@@ -1,5 +1,5 @@
 #source: pv32.s
-#as: --march=v32 --no-underscore --em=criself
+#as: --march=v32 --no-underscore --emulation=criself
 #ld: -e here -m crislinux tmpdir/libdso-12.so --hash-style=sysv
 #objdump: -s -T
 

diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
index 46ad8ab952b25fdb7fcbb319f4119ab9d1baa044..cd999813b325c68c9cb41a0e795538833093fb0b 100644 (file)
--- a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
+++ b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
@@ -3,7 +3,7 @@
 #source: tls-gd-1.s
 #source: tls128.s
 #source: tls-x.s
-#as: --no-underscore --em=criself --pic -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself --pic -I$srcdir/$subdir
 #ld: -m crislinux --shared --hash-style=sysv --hash-style=sysv
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
index a8f130519554c2a327d78e56058d6c224f5cd564..b1792e8c966f5b5cd176537e8752ce5b169c678c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
+++ b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
@@ -3,7 +3,7 @@
 #source: tls-gd-1.s
 #source: tls128.s
 #source: tls-commx.s
-#as: --no-underscore --em=criself --pic -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself --pic -I$srcdir/$subdir
 #ld: -m crislinux --shared --hash-style=sysv
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d b/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
index a5911131bbe1f9eb0ab7e805bc5b2ce1ed4ac67c..fcdfe4ee298f016cbb12da0609dc5ac09cef1cc7 100644 (file)
--- a/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
+++ b/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-dso-tpoffgotcomm1.s
-#as: --no-underscore --pic --em=criself -I$srcdir/$subdir
+#as: --no-underscore --pic --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux -shared --hash-style=sysv
 #objdump: -d -h -s -t -r -R -p
 

diff --git a/ld/testsuite/ld-cris/tls-dso-x1x2-1.d b/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
index 616870191986aa36a694f373ae47472eb0ecb720..29e3ed74fa240765c31560828aa4952077d9506d 100644 (file)
--- a/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
+++ b/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
@@ -1,6 +1,6 @@
 #source: tls-hx.s
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/tls-dso-xz-1.d b/ld/testsuite/ld-cris/tls-dso-xz-1.d
index 9a33b78cc942589c59f2fd58c7f765412d69ac2f..87a016501cf4ff584bc832fa393ca0e2bebc25c7 100644 (file)
--- a/ld/testsuite/ld-cris/tls-dso-xz-1.d
+++ b/ld/testsuite/ld-cris/tls-dso-xz-1.d
@@ -2,7 +2,7 @@
 #source: tls-hx1x2.s
 #source: tls-x.s
 #source: tls-z.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/tls-e-20.d b/ld/testsuite/ld-cris/tls-e-20.d
index eb323a59804ca81aea17bdc6b64777f845cf5db3..d192e8404095b3e0d3178c5e4fed11b82f7cb293 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-20.d
+++ b/ld/testsuite/ld-cris/tls-e-20.d
@@ -4,7 +4,7 @@
 #source: tls-ld-6.s --pic
 #source: tls-ie-10.s --pic
 #source: tls-hx1x2.s --pic
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-20a.d b/ld/testsuite/ld-cris/tls-e-20a.d
index 7d5a95e8b26e67ff7ea3089b80692d0c2f0564e2..5680184cf15f7dac694b013925c312a6b63421ed 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-20a.d
+++ b/ld/testsuite/ld-cris/tls-e-20a.d
@@ -6,7 +6,7 @@
 #source: tls-ie-10.s
 #source: tls-hx.s
 #source: tls-hx1x2.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir --pic
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir --pic
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-21.d b/ld/testsuite/ld-cris/tls-e-21.d
index 80ca3e37f774c60cff744896a27dd867a2e2d100..33c2214a0c2e0f48f57dafb7fd259575843ff273 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-21.d
+++ b/ld/testsuite/ld-cris/tls-e-21.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-gd-2.s
 #source: tls-hx.s
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-22.d b/ld/testsuite/ld-cris/tls-e-22.d
index 93ab45da7b41f0bd279a88eb9d124d04e7888f6f..c49a4b49bc1973014c8df070a9950d0f134fdf6d 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-22.d
+++ b/ld/testsuite/ld-cris/tls-e-22.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-ld-6.s
 #source: tls-hx.s
-#as: --no-underscore --em=criself --pic -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself --pic -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-23.d b/ld/testsuite/ld-cris/tls-e-23.d
index a09d55ef901d9cc4d1f3ad6b952c138b5f86d2d5..ae07bb27c701d3e325be99957ee442d955f54180 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-23.d
+++ b/ld/testsuite/ld-cris/tls-e-23.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-ie-10.s
 #source: tls-hx.s
-#as: --no-underscore --em=criself --pic -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself --pic -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-66.d b/ld/testsuite/ld-cris/tls-e-66.d
index ba1755d3fa60cef9da9594fd159b0560852f9d36..f556ddf3004b43953e243fffbb3ec30d5ae51e66 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-66.d
+++ b/ld/testsuite/ld-cris/tls-e-66.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-le-12s.s
 #source: tls-z.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p -h
 

diff --git a/ld/testsuite/ld-cris/tls-e-80.d b/ld/testsuite/ld-cris/tls-e-80.d
index 15ce3d7838bcd8e09c65b7253bfa6e1cf04addef..919be62c66d310bc176ff90d6101d66bada2f854 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-80.d
+++ b/ld/testsuite/ld-cris/tls-e-80.d
@@ -8,7 +8,7 @@
 #source: tls-ld-6.s --pic
 #source: tls-ie-10.s --pic
 #source: tls-hx1x2.s --pic
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-dtpoffd1.d b/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
index 5da24b53d51f49b6b9349d48f22615b47beaff83..3d07dbc1f02e70c759004a0b195a35f6c95f1747 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
+++ b/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
@@ -3,7 +3,7 @@
 #source: tls-gd-1.s
 #source: tls128.s
 #source: tls-x.s
-#as: --no-underscore --em=criself --pic -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself --pic -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-dtpoffd3.d b/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
index 6013a3a1e22f1945b82786be96d6cf1bd78fc729..f6195987b5e784ddfb67f4e6943be17a5a874ac4 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
+++ b/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
@@ -3,7 +3,7 @@
 #source: tls-gd-1.s
 #source: tls128.s
 #source: tls-commx.s
-#as: --no-underscore --em=criself --pic -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself --pic -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-tpiecomm1.d b/ld/testsuite/ld-cris/tls-e-tpiecomm1.d
index 2e0f0f0b92e0e3d961835ef4ddb4a6e5b2a57f9b..0360790b5a64619b4969670ce713e42a2850e303 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-tpiecomm1.d
+++ b/ld/testsuite/ld-cris/tls-e-tpiecomm1.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-e-tpiecomm1.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d b/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
index 4fc067eb7905f7b61ea90c47c727b279679ddc9f..4300a22f8d709bb2e3d486975fff4d4a4a83e422 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
+++ b/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-e-tpoffcomm1.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-e-tpoffgotcomm1.d b/ld/testsuite/ld-cris/tls-e-tpoffgotcomm1.d
index 9d34f683b4e90853d7ffd373cda1a942fb84c123..a0501e9641b6729922fc635fb223c411d9ca4b16 100644 (file)
--- a/ld/testsuite/ld-cris/tls-e-tpoffgotcomm1.d
+++ b/ld/testsuite/ld-cris/tls-e-tpoffgotcomm1.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-dso-tpoffgotcomm1.s --pic
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -h -t -p
 

diff --git a/ld/testsuite/ld-cris/tls-err-20x.d b/ld/testsuite/ld-cris/tls-err-20x.d
index 9a3af03192dd772f7aea1075ea065abf1bb1c012..06661dcfbe56db313658430d25923f7a228bab75 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-20x.d
+++ b/ld/testsuite/ld-cris/tls-err-20x.d
@@ -3,7 +3,7 @@
 #source: tls-ld-6.s --pic
 #source: tls-ie-10.s --pic
 #source: tls-hx.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*: warning: cannot find entry symbol _start; defaulting to [0-9a-f]*\n[^\n]*: in function `tlsdsofn9':\n[^\n]*: undefined reference to `x1'\n[^\n]*: undefined reference to `x2'\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-24.d b/ld/testsuite/ld-cris/tls-err-24.d
index 08678700f903c3acec5bb05f1cfad5bbe6e8c428..504b76e47f68bf71bba278940ede0f87462ab144 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-24.d
+++ b/ld/testsuite/ld-cris/tls-err-24.d
@@ -1,6 +1,6 @@
 #source: tls-le-12s.s
 #source: tls-z.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o, [^\n]*\n[^\n]*mixup[^\n]*\n[^\n]*invalid operation\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-25.d b/ld/testsuite/ld-cris/tls-err-25.d
index e162d6e8e057053c6100d20759a18edc6d31cb45..6f049f2f39198f3bd473fb12cd582927c3336f14 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-25.d
+++ b/ld/testsuite/ld-cris/tls-err-25.d
@@ -1,6 +1,6 @@
 #source: tls-le-12.s
 #source: tls-z.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o, [^\n]*\n[^\n]*mixup[^\n]*\n[^\n]*invalid operation\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-26.d b/ld/testsuite/ld-cris/tls-err-26.d
index 45ebfe272ff8fe850c3e53b9ecfdd31f6d8e49f0..e8f18a316e2d7aeb8ff3315c8219fd8187dee932 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-26.d
+++ b/ld/testsuite/ld-cris/tls-err-26.d
@@ -1,6 +1,6 @@
 #source: tls-ld-4.s
 #source: tls-x.s
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o,[^\n]*mixup[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-27.d b/ld/testsuite/ld-cris/tls-err-27.d
index ce5592499d7171c8ccefc1a439c572b5c9050b50..876e5adc32bf79779dde0363a5d578ef4cbbdde2 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-27.d
+++ b/ld/testsuite/ld-cris/tls-err-27.d
@@ -1,6 +1,6 @@
 #source: tls-ld-6.s
 #source: tls-x.s
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o,[^\n]*mixup[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-28.d b/ld/testsuite/ld-cris/tls-err-28.d
index 8ccd40b0f76a2533e9fbbf4bd52f1db1527239e1..4edf9f93c28f49b2091f9bc0e10b979dc092b391 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-28.d
+++ b/ld/testsuite/ld-cris/tls-err-28.d
@@ -1,6 +1,6 @@
 #source: tls-gd-3.s
 #source: tls-x.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o, [^\n]*\n[^\n]*mixup[^\n]*\n[^\n]*invalid operation\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-29.d b/ld/testsuite/ld-cris/tls-err-29.d
index e0d73271778e08319e4df9866858d81ed2ea7bc8..d5c9d756e2e2ec1f557a463c9871fc7990dcc942 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-29.d
+++ b/ld/testsuite/ld-cris/tls-err-29.d
@@ -1,6 +1,6 @@
 #source: init.s
 #source: tls-gdgotrelm.s --defsym r=8192
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-31.d b/ld/testsuite/ld-cris/tls-err-31.d
index b7484ad5feae075bc6f88775f4ababdb0916f43c..ccc5027aa2940a74a4a62d04a5dbe9f71c328fff 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-31.d
+++ b/ld/testsuite/ld-cris/tls-err-31.d
@@ -1,5 +1,5 @@
 #source: tls-dtprelm.s --defsym r=32768
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too big[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-33.d b/ld/testsuite/ld-cris/tls-err-33.d
index 329fae1e58573739ebe4c4ff633304c207340ffe..d3fb23196f12e4cdb75b3a1515f65564048bf27a 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-33.d
+++ b/ld/testsuite/ld-cris/tls-err-33.d
@@ -1,5 +1,5 @@
 #source: tls-gottprelm.s --defsym r=8190
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-35.d b/ld/testsuite/ld-cris/tls-err-35.d
index b203e3599132e8b71768a1b390d366b005b090ec..7d7a37199838bdfe56fa1da63d13fcb0ab3e9a46 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-35.d
+++ b/ld/testsuite/ld-cris/tls-err-35.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-tprelm.s --defsym r=32768
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too big[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-37.d b/ld/testsuite/ld-cris/tls-err-37.d
index a41dd0a75504e2638a017b94e2cc07821af62a2d..10a2cc283770374e87b13c938212ab358636310c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-37.d
+++ b/ld/testsuite/ld-cris/tls-err-37.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-gd-2.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-39.d b/ld/testsuite/ld-cris/tls-err-39.d
index fbdc698d5e3ca9dcdda4e50d25fac3d495fea969..a666fcb8155f92cdb1f9a4b2874efd4ebbc8cc23 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-39.d
+++ b/ld/testsuite/ld-cris/tls-err-39.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-ld-6.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-40.d b/ld/testsuite/ld-cris/tls-err-40.d
index 91b4165c468d5d9ab1d03e8a7a4b839c8949121c..8bcd356012c67d321fe51b14c12ddd3926c87647 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-40.d
+++ b/ld/testsuite/ld-cris/tls-err-40.d
@@ -1,5 +1,5 @@
 #source: tls-ld-6.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared
 #error: \A[^\n]*\.o[^\n]*undefined reference[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-41.d b/ld/testsuite/ld-cris/tls-err-41.d
index 0c4705f7b36182149e2c4aabf1beb281aa4a4b3e..b74bbb8448f1b8a5f40e13d866dd0c94bf333af2 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-41.d
+++ b/ld/testsuite/ld-cris/tls-err-41.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-ie-10.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-43.d b/ld/testsuite/ld-cris/tls-err-43.d
index bb3abb42358dae123018aa5d14dc0c4f0b00ca9e..de5eb4c8ceb79240f5454c576d6b3f5b374ddfe1 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-43.d
+++ b/ld/testsuite/ld-cris/tls-err-43.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-le-12.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-44.d b/ld/testsuite/ld-cris/tls-err-44.d
index 941e21c5976002f56e56158b48a3c94a69498515..f70a965924f5f5b9a8a705255368c61384cee751 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-44.d
+++ b/ld/testsuite/ld-cris/tls-err-44.d
@@ -1,5 +1,5 @@
 #source: tls-le-12.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared
 #error: \A[^\n]*\.o, [^\n]*\n[^\n]*mixup[^\n]*\n[^\n]*invalid operation\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-45.d b/ld/testsuite/ld-cris/tls-err-45.d
index 28faa3068468b894da317feaa2697908fa6751df..dedab8f6691fe2c2eccc0ae1b210ca9168c81832 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-45.d
+++ b/ld/testsuite/ld-cris/tls-err-45.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-gd-1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-47.d b/ld/testsuite/ld-cris/tls-err-47.d
index 4f7139bebbd0954221324f14c8ae96daac18bdf5..035ca1e9287f271a4c3834d56e1861de35b08cff 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-47.d
+++ b/ld/testsuite/ld-cris/tls-err-47.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-ld-4.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-48.d b/ld/testsuite/ld-cris/tls-err-48.d
index 756f1b595c2e9f1339c85ea75cc52df0f997d28a..5530c34bc94f4153c85150f47054625c7ab60ac0 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-48.d
+++ b/ld/testsuite/ld-cris/tls-err-48.d
@@ -1,5 +1,5 @@
 #source: tls-ld-4.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared
 #error: \A[^\n]*\.o[^\n]*undefined reference[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-49.d b/ld/testsuite/ld-cris/tls-err-49.d
index 5d8a9c97e33a4c9826f36629f57ac27e6cd30aca..6509560dacd59eeacca841d70b4823c595480d87 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-49.d
+++ b/ld/testsuite/ld-cris/tls-err-49.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-ie-8.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-51.d b/ld/testsuite/ld-cris/tls-err-51.d
index 3891aacc23ec8586ab4cda957a3b1b4e60dfc25f..efe5f3cac4d3f6e77790e4c7175f1ff2cbcb3761 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-51.d
+++ b/ld/testsuite/ld-cris/tls-err-51.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-le-12s.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #error: \A[^\n]*\.o: in function[^\n]*\n[^\n]*undefined reference[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-52.d b/ld/testsuite/ld-cris/tls-err-52.d
index b2f85cf9ac2c8f50cc22bb1959507647685ee6ef..9aeb260a226e1a223ab3f86e1900d687014709bf 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-52.d
+++ b/ld/testsuite/ld-cris/tls-err-52.d
@@ -1,5 +1,5 @@
 #source: tls-le-12s.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared
 #error: \A[^\n]*\.o, [^\n]*\n[^\n]*mixup[^\n]*\n[^\n]*invalid operation\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-53.d b/ld/testsuite/ld-cris/tls-err-53.d
index 89884be0cad209fc474130ddf8c346f03d3e69d7..31f3a3c2f8087e4686d783817b910b4bced87494 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-53.d
+++ b/ld/testsuite/ld-cris/tls-err-53.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-ld-4.s
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: -m crislinux tmpdir/tls-dso-xz-1.so
 #error: \A[^\n]*\.o,[^\n]*mixup[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-55.d b/ld/testsuite/ld-cris/tls-err-55.d
index 32f05176845ac031845f13c2c961164f527e22a4..10a801662cc8df8e66c094924721bf532234a410 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-55.d
+++ b/ld/testsuite/ld-cris/tls-err-55.d
@@ -1,5 +1,5 @@
 #source: tls-err-55.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o[^\n]*relocation R_CRIS_32_GOT_GD with non-zero addend 42 against symbol `tls128'[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-56.d b/ld/testsuite/ld-cris/tls-err-56.d
index 8a68dd1965494f4c8f799ccbb125f95ff23349a8..d46e27ede3d00f3a989a61ca622040e9c8d699f4 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-56.d
+++ b/ld/testsuite/ld-cris/tls-err-56.d
@@ -1,5 +1,5 @@
 #source: tls-err-56.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o[^\n]*relocation R_CRIS_32_GOT_GD with non-zero addend 42 against symbol `tls128'[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-62.d b/ld/testsuite/ld-cris/tls-err-62.d
index da64d1c1f16246fa959fb3cd4e45c1b92147025f..1e1800032c49a8c98e78e4516bdd6f1cce6bc174 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-62.d
+++ b/ld/testsuite/ld-cris/tls-err-62.d
@@ -1,5 +1,5 @@
 #source: tls-err-62.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o[^\n]*relocation R_CRIS_32_GOT_TPREL with non-zero addend 42 against symbol `tls128'[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-65.d b/ld/testsuite/ld-cris/tls-err-65.d
index 62958a229ce9a8a43b0bbc29d6fa62e1362147d0..0de5e51ecbccf4e61b3271b288339eef89ea8c50 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-65.d
+++ b/ld/testsuite/ld-cris/tls-err-65.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-le-12s.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/tls-dso-xz-1.so
 #error: \A[^\n]*\.o,[^\n]*mixup[^\n]*\n[^\n]*bad value\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-67.d b/ld/testsuite/ld-cris/tls-err-67.d
index 6a010e1f5afa66c8e628fea4f0b6afa6a1b69c96..a1493e5635259ac5c2a0acfd1d67fc7e67dafe7c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-67.d
+++ b/ld/testsuite/ld-cris/tls-err-67.d
@@ -1,6 +1,6 @@
 #source: init.s
 #source: tls-gdgotrelm.s --defsym r=8203
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*truncated[^\n]*\n[^\n]*too many[^\n]*\n[^\n]*\.o: in[^\n]*\n[^\n]*omitted[^\n]*\Z
 

diff --git a/ld/testsuite/ld-cris/tls-err-77.d b/ld/testsuite/ld-cris/tls-err-77.d
index 6b7696bacfd0c5cdc9a4ad6a62661f558d17d95e..2888da36d3461843275488d1f105b48c2a1614dd 100644 (file)
--- a/ld/testsuite/ld-cris/tls-err-77.d
+++ b/ld/testsuite/ld-cris/tls-err-77.d
@@ -1,6 +1,6 @@
 #source: tls-ie-8e.s
 #source: tls-x.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: --shared -m crislinux
 #error: \A[^\n]*\.o, [^\n]*\n[^\n]*mixup[^\n]*\n[^\n]*invalid operation\Z
 

diff --git a/ld/testsuite/ld-cris/tls-gc-68.d b/ld/testsuite/ld-cris/tls-gc-68.d
index c1a7d25c803440b0839c66bec9ccae01695c3134..a2c04f103f76d5b1ee57b7dcc6a3a26eaf57b81a 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-68.d
+++ b/ld/testsuite/ld-cris/tls-gc-68.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-x.s
 #source: tls-local-58.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux --gc-sections
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-gc-69.d b/ld/testsuite/ld-cris/tls-gc-69.d
index ef02437a7d6dd64780af3af55f8794edacb5c736..3714efb0ac573e03d06f2892ddf04aa74fc6060b 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-69.d
+++ b/ld/testsuite/ld-cris/tls-gc-69.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-x.s
 #source: tls-local-59.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux --gc-sections
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-gc-70.d b/ld/testsuite/ld-cris/tls-gc-70.d
index 74d0d1373f4370e4239d3a02505aff62f81a441e..b6c5c7642aa6964e0abbef1c0ef21245d32f0d13 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-70.d
+++ b/ld/testsuite/ld-cris/tls-gc-70.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-gd-3.s
 #source: tls-x.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --gc-sections
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-gc-71.d b/ld/testsuite/ld-cris/tls-gc-71.d
index 343204e7ead5542b802d77a671a21d803af58bbb..c6f35ca23f3ef27862ef70d19b08a9a1fce36368 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-71.d
+++ b/ld/testsuite/ld-cris/tls-gc-71.d
@@ -2,7 +2,7 @@
 #source: init.s
 #source: tls128g.s
 #source: tls-hx.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --gc-sections --hash-style=sysv
 #objdump: -s -t -R -p -T
 

diff --git a/ld/testsuite/ld-cris/tls-gc-75.d b/ld/testsuite/ld-cris/tls-gc-75.d
index f377dc263e7f8d8ed80a65866587a136bfda4264..2ce0fcf85b92964aaae339ab0ad0dd371af4eef7 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-75.d
+++ b/ld/testsuite/ld-cris/tls-gc-75.d
@@ -4,7 +4,7 @@
 #source: tls-ie-10.s
 #source: tls-gd-1.s
 #source: tls-ie-8.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux --gc-sections
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-gc-76.d b/ld/testsuite/ld-cris/tls-gc-76.d
index 2bcf25c27eabd9ceb0fe6cdb9dd61189a171c0e3..01d37c9e58831ea939e5535005b89a96c819ba1c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-76.d
+++ b/ld/testsuite/ld-cris/tls-gc-76.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux --gc-sections -u gc76fn
 #source: start1.s
 #source: tls-gc-76.s

diff --git a/ld/testsuite/ld-cris/tls-gc-79.d b/ld/testsuite/ld-cris/tls-gc-79.d
index a5bd7ffe37db82fb6b83773cf49873af5c91cafb..92fce152fce895bbaee114c331f14809924af115 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gc-79.d
+++ b/ld/testsuite/ld-cris/tls-gc-79.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-ie-8e.s
 #source: tls-x.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --gc-sections
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-gd-1.d b/ld/testsuite/ld-cris/tls-gd-1.d
index 5156a27dc2cec4329e523241dcc04ea3e2b32c3b..61d58048e1266e88bb0fe2f507bde4affab6d1ec 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gd-1.d
+++ b/ld/testsuite/ld-cris/tls-gd-1.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-gd-1.s
 #source: tls128.s

diff --git a/ld/testsuite/ld-cris/tls-gd-1h.d b/ld/testsuite/ld-cris/tls-gd-1h.d
index e0123042360ee46a81038e057ac48dd5c613d812..242f3acbf7a3f530108713f89b4ad3924cbd9c64 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gd-1h.d
+++ b/ld/testsuite/ld-cris/tls-gd-1h.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-gd-1.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-gd-2.d b/ld/testsuite/ld-cris/tls-gd-2.d
index 107687cc93dbf5d3bbf7f5e36b81a847aebad206..989fa561601ae57721aebefb8fba92d5dbfa1b76 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gd-2.d
+++ b/ld/testsuite/ld-cris/tls-gd-2.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-gd-2.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-gd-2h.d b/ld/testsuite/ld-cris/tls-gd-2h.d
index f5eaa8b20f943794ccb6e53512b916e2df4df267..1041de4f47a72e3c79cf6cad8be351365058171c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gd-2h.d
+++ b/ld/testsuite/ld-cris/tls-gd-2h.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-gd-2.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-gd-3.d b/ld/testsuite/ld-cris/tls-gd-3.d
index b2de85103bc928dcd0c089ce83b5e200ea27caa8..d9ed9dec39ebba6a78343db6afb98b9e8433db7a 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gd-3.d
+++ b/ld/testsuite/ld-cris/tls-gd-3.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-gd-3.s
 #source: tls-x.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-gd-3h.d b/ld/testsuite/ld-cris/tls-gd-3h.d
index 898a670e16486d4ebc4349ee9fb2f66ae52757a2..69455e620c32815cdaf9bad93747fd6c6f13b02c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-gd-3h.d
+++ b/ld/testsuite/ld-cris/tls-gd-3h.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-gd-3.s
 #source: tls-hx.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-global-74.d b/ld/testsuite/ld-cris/tls-global-74.d
index b70c6a95b1bef03842dc8ab4c2cc1d0176124fb4..e0b9859e01bef8a30d530f91d9ce000391aad169 100644 (file)
--- a/ld/testsuite/ld-cris/tls-global-74.d
+++ b/ld/testsuite/ld-cris/tls-global-74.d
@@ -4,7 +4,7 @@
 #source: tls-ie-10.s
 #source: tls-gd-1.s
 #source: tls-ie-8.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-ie-10.d b/ld/testsuite/ld-cris/tls-ie-10.d
index 0df1e9d4af560a7b15f5fd0c959d2956be8e495a..bf010f070784940385dde0ec907a246ee83904c1 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ie-10.d
+++ b/ld/testsuite/ld-cris/tls-ie-10.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ie-10.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-ie-11.d b/ld/testsuite/ld-cris/tls-ie-11.d
index 3bd727a6b3c92e702237644ed420aae38affe9fc..8a43359270ed67726534dcfa3e2f13826d5cc577 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ie-11.d
+++ b/ld/testsuite/ld-cris/tls-ie-11.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ie-11.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-ie-78.d b/ld/testsuite/ld-cris/tls-ie-78.d
index ae9862c875b8d379acd29f90c0cb2e764bd160b7..7e477490368141b783911d83c21a7df704030b35 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ie-78.d
+++ b/ld/testsuite/ld-cris/tls-ie-78.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls128.s
 #source: tls-ie-8e.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #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-ie-8.d b/ld/testsuite/ld-cris/tls-ie-8.d
index 4af78fbac8a9e7b1cb7158f360d481231da97dd3..deed73f7f25eaa5e039b03beee1f8e99c076a27c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ie-8.d
+++ b/ld/testsuite/ld-cris/tls-ie-8.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ie-8.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-ie-8e1.d b/ld/testsuite/ld-cris/tls-ie-8e1.d
index 0093935a79e0ebc7aa89f818a86965612bd1a72c..2666e3e4b0f097b44093c27f08387f71f674f43e 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ie-8e1.d
+++ b/ld/testsuite/ld-cris/tls-ie-8e1.d
@@ -1,4 +1,4 @@
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #source: start1.s
 #source: tls-ie-8e.s

diff --git a/ld/testsuite/ld-cris/tls-ie-9.d b/ld/testsuite/ld-cris/tls-ie-9.d
index c1b5b1a1e74eba1b3b7ea000ab52208de8b61a6a..5334dc5eb7f3d976cad955f59f553d8b329c601b 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ie-9.d
+++ b/ld/testsuite/ld-cris/tls-ie-9.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ie-9.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
index f007ea4cf58394611cac226e43ede220f4f8b19c..099d0461a396d5e4bd85b9485f96483594195a1b 100644 (file)
--- a/ld/testsuite/ld-cris/tls-js1.d
+++ b/ld/testsuite/ld-cris/tls-js1.d
@@ -4,7 +4,7 @@
 #source: expdyn1.s
 #source: tls-hx.s
 #source: dso-1.s
-#as: --pic --no-underscore --em=criself --march=v32
+#as: --pic --no-underscore --emulation=criself --march=v32
 #ld: --shared -m crislinux --hash-style=sysv
 #readelf: -a
 

diff --git a/ld/testsuite/ld-cris/tls-ld-4.d b/ld/testsuite/ld-cris/tls-ld-4.d
index ea1fc29d827c3e4ed58ee09dfd88d08dcefcd66f..2d2c7c59e96327617c585f07f5442c8399ac122c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ld-4.d
+++ b/ld/testsuite/ld-cris/tls-ld-4.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ld-4.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-ld-5.d b/ld/testsuite/ld-cris/tls-ld-5.d
index 5d423aad4f3f678b6035cd079a4514988f48152f..f2bb06e1ee2a6cd0cc9631c276f2827cfd34a6fb 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ld-5.d
+++ b/ld/testsuite/ld-cris/tls-ld-5.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ld-5.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-ld-6.d b/ld/testsuite/ld-cris/tls-ld-6.d
index 21dbabefa96dbdc350b95fe58ac5e9ceca620bdb..db00c15be95c6e52190960474ee9f969400ab7bd 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ld-6.d
+++ b/ld/testsuite/ld-cris/tls-ld-6.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls128g.s
 #source: tls-ld-6.s

diff --git a/ld/testsuite/ld-cris/tls-ld-7.d b/ld/testsuite/ld-cris/tls-ld-7.d
index e0fb31e8523f111103d51ff2a3d028b9e7495a8e..7f89a907e4f733257bea61aa3d7aa4123cd05224 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ld-7.d
+++ b/ld/testsuite/ld-cris/tls-ld-7.d
@@ -1,4 +1,4 @@
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #source: tls-ld-7.s
 #source: tls128g.s

diff --git a/ld/testsuite/ld-cris/tls-ldgd-14.d b/ld/testsuite/ld-cris/tls-ldgd-14.d
index 0c1d48658fb42ce7ef967c800f9cd143df45e87a..1a93a47c53a19707c5aa1afe36d1b6a5f25d3136 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgd-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgd-14.d
@@ -5,7 +5,7 @@
 #source: tls-x.s
 #source: tls-z.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -t -R -p -T
 

diff --git a/ld/testsuite/ld-cris/tls-ldgd-15.d b/ld/testsuite/ld-cris/tls-ldgd-15.d
index 7916d3111ea5e9682ee97fdb7c484c8fd74c506f..a51e8ff9b03e3f639e2ef9cea2f7fa1cda024095 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgd-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgd-15.d
@@ -5,7 +5,7 @@
 #source: tls-x.s
 #source: tls-z.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -t -R -p -T
 

diff --git a/ld/testsuite/ld-cris/tls-ldgde-14.d b/ld/testsuite/ld-cris/tls-ldgde-14.d
index 9eada3eb2ae6937905bc110c29061853501ff491..0f2d90df9689ea01cdca092fa2febcbd65b8d54b 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgde-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgde-14.d
@@ -6,7 +6,7 @@
 #source: tls-x.s
 #source: tls-z.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-ldgde-15.d b/ld/testsuite/ld-cris/tls-ldgde-15.d
index d5e993dfeea36ae89a808c519ffea294c9b81f74..8b3c6ed40aaceb0db5738f1d7e2cf411c5bce146 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgde-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgde-15.d
@@ -6,7 +6,7 @@
 #source: tls-x.s
 #source: tls-z.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-ldgdex-14.d b/ld/testsuite/ld-cris/tls-ldgdex-14.d
index 86a8d4e986570f1092dd768bf4c84bf7daa12748..b96e6de66eff84741e39a8f8e1802ba3cc5cf5f9 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgdex-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-14.d
@@ -4,7 +4,7 @@
 #source: tls-gd-1.s
 #source: tls-ldgd-14.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-ldgdex-15.d b/ld/testsuite/ld-cris/tls-ldgdex-15.d
index 0a4e527325e8f07aad2d30b55ace0594e3295a49..0589a3514d8f45813048f0a88491536122bb3a28 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgdex-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-15.d
@@ -4,7 +4,7 @@
 #source: tls-gd-2.s
 #source: tls-ldgd-15.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-ldgdx-14.d b/ld/testsuite/ld-cris/tls-ldgdx-14.d
index a773522d491e3ae3616fa9acabbbc91fece2709c..d9d229eec7e167d2724076fdada781695c3e881b 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgdx-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdx-14.d
@@ -3,7 +3,7 @@
 #source: tls-gd-1.s
 #source: tls-ldgd-14.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv tmpdir/tls-dso-xz-1.so
 #objdump: -s -h -t -T -R -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-ldgdx-15.d b/ld/testsuite/ld-cris/tls-ldgdx-15.d
index e0b9a53976058a41cc5058940a6241306172c296..ac3dfd6de925de47c8b23ff1b3a693105287eba4 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ldgdx-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdx-15.d
@@ -3,7 +3,7 @@
 #source: tls-gd-2.s
 #source: tls-ldgd-15.s
 #source: tls-hx1x2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux --hash-style=sysv tmpdir/tls-dso-xz-1.so
 #objdump: -s -h -t -T -R -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-le-12.d b/ld/testsuite/ld-cris/tls-le-12.d
index d24b21b68047f6734ed45e8df05d961958d6f4ef..b5d8abffed3172ebb446b5599a818cb1d5a3c36a 100644 (file)
--- a/ld/testsuite/ld-cris/tls-le-12.d
+++ b/ld/testsuite/ld-cris/tls-le-12.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-le-12.s
 #source: tls-z.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p -h
 

diff --git a/ld/testsuite/ld-cris/tls-le-12s.d b/ld/testsuite/ld-cris/tls-le-12s.d
index 96570e9840a7099bd4b2a7d335661e887c064125..b69b87152339a255dd4750a779945ebc07e2297e 100644 (file)
--- a/ld/testsuite/ld-cris/tls-le-12s.d
+++ b/ld/testsuite/ld-cris/tls-le-12s.d
@@ -2,7 +2,7 @@
 #source: tls-le-12s.s
 #source: tls-z.s
 #source: tls128.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p -h
 

diff --git a/ld/testsuite/ld-cris/tls-le-13.d b/ld/testsuite/ld-cris/tls-le-13.d
index 3d969ac8e69af64b581323a854ffe2f4425c059d..c04de5772e73b0c51413cc5c10f02650b8c601e1 100644 (file)
--- a/ld/testsuite/ld-cris/tls-le-13.d
+++ b/ld/testsuite/ld-cris/tls-le-13.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-le-13.s
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p -h
 

diff --git a/ld/testsuite/ld-cris/tls-le-13s.d b/ld/testsuite/ld-cris/tls-le-13s.d
index 146c9132bb3166682ab90873abce70c63c6d93e4..dc5720e83465c64a180dc0aeae42d833f66f3f92 100644 (file)
--- a/ld/testsuite/ld-cris/tls-le-13s.d
+++ b/ld/testsuite/ld-cris/tls-le-13s.d
@@ -2,7 +2,7 @@
 #source: tls128.s
 #source: tls-le-13s.s
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself -I$srcdir/$subdir
+#as: --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -d -s -t -r -p -h
 

diff --git a/ld/testsuite/ld-cris/tls-legd-16.d b/ld/testsuite/ld-cris/tls-legd-16.d
index 092d39e8614531d00e10febc36dc75da880975e8..b5fc3d779280325fbd33d1ecb8e1a10bdf43bfe2 100644 (file)
--- a/ld/testsuite/ld-cris/tls-legd-16.d
+++ b/ld/testsuite/ld-cris/tls-legd-16.d
@@ -6,7 +6,7 @@
 #source: tls-x.s
 #source: tls-z.s
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-legd-17.d b/ld/testsuite/ld-cris/tls-legd-17.d
index 49f2d458e04195003e199cafbb3b4f7fb05b2cca..f7f44218a5fa608d4dfa9bb486864fc5e7585647 100644 (file)
--- a/ld/testsuite/ld-cris/tls-legd-17.d
+++ b/ld/testsuite/ld-cris/tls-legd-17.d
@@ -6,7 +6,7 @@
 #source: tls-x.s
 #source: tls-z.s
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-legdx-16.d b/ld/testsuite/ld-cris/tls-legdx-16.d
index badbeb3fab83e716246a0508414f01a93f1b7fc1..11816cc5281a9dd550556543a574581e8f0aa8b8 100644 (file)
--- a/ld/testsuite/ld-cris/tls-legdx-16.d
+++ b/ld/testsuite/ld-cris/tls-legdx-16.d
@@ -4,7 +4,7 @@
 #source: tls-gd-3.s
 #source: tls-legd-16.s
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-legdx-17.d b/ld/testsuite/ld-cris/tls-legdx-17.d
index 5b2c7ecbfc0b91d41834e3b43bcb68a821e7f379..9eba531911bf4b124540cf62425a51a37186ef41 100644 (file)
--- a/ld/testsuite/ld-cris/tls-legdx-17.d
+++ b/ld/testsuite/ld-cris/tls-legdx-17.d
@@ -4,7 +4,7 @@
 #source: tls-gd-2.s --pic
 #source: tls-ldgd-14.s --pic
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/tls-dso-xz-1.so --hash-style=sysv
 #objdump: -s -h -t -T -R -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-leie-18.d b/ld/testsuite/ld-cris/tls-leie-18.d
index edff43c21951714e6612e132372da6379ab2e13c..2285f46f0b9a88efa8826ae4987ca23a9fac1642 100644 (file)
--- a/ld/testsuite/ld-cris/tls-leie-18.d
+++ b/ld/testsuite/ld-cris/tls-leie-18.d
@@ -3,7 +3,7 @@
 #source: tls-le-13s.s
 #source: tls-ie-9.s --pic
 #source: tls-x1x2.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-leie-19.d b/ld/testsuite/ld-cris/tls-leie-19.d
index 859e2e64dd82cf864c0e5ce42569061b0282f5f5..09f5cf62bd1ec6503422438138d31beef5f68041 100644 (file)
--- a/ld/testsuite/ld-cris/tls-leie-19.d
+++ b/ld/testsuite/ld-cris/tls-leie-19.d
@@ -6,7 +6,7 @@
 #source: tls-hx1x2.s
 #source: tls-x.s
 #source: tls-z.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -d -s -h -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-local-54.d b/ld/testsuite/ld-cris/tls-local-54.d
index 0098e56d76e48930718874abbb4b8ddc3c6f4de3..1209cfd6ba5d3de84a8e9c5633de6602a13fc143 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-54.d
+++ b/ld/testsuite/ld-cris/tls-local-54.d
@@ -1,5 +1,5 @@
 #source: tls-local-54.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -t -R -p -T
 

diff --git a/ld/testsuite/ld-cris/tls-local-57.d b/ld/testsuite/ld-cris/tls-local-57.d
index cce2486cb61f73314120b9de8f4c2e9f66cfd59e..ed74fe0dcb32ef694423f24fdadcbcb8e797f967 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-57.d
+++ b/ld/testsuite/ld-cris/tls-local-57.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-x.s
 #source: tls-local-57.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-local-58.d b/ld/testsuite/ld-cris/tls-local-58.d
index d7926bdea4123fd0b6bf614b09243a914e1524b2..e22b39321d4121d5fb4eb0aa5fd956740b5bd552 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-58.d
+++ b/ld/testsuite/ld-cris/tls-local-58.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-x.s
 #source: tls-local-58.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-local-59.d b/ld/testsuite/ld-cris/tls-local-59.d
index c37584bdbc0221cc0a36525a0a57447aa99c206b..ee68c3ae35186196cf58fe0b50474e86e62d05dd 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-59.d
+++ b/ld/testsuite/ld-cris/tls-local-59.d
@@ -1,7 +1,7 @@
 #source: start1.s
 #source: tls-x.s
 #source: tls-local-59.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux
 #objdump: -s -t -r -p
 

diff --git a/ld/testsuite/ld-cris/tls-local-60.d b/ld/testsuite/ld-cris/tls-local-60.d
index ce642033adaedc13560be3ac85e058b9d5d53117..acbed2635dc08acad4e720f5eaae34d33d8c3e7c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-60.d
+++ b/ld/testsuite/ld-cris/tls-local-60.d
@@ -1,6 +1,6 @@
 #source: tls-x.s
 #source: tls-local-59.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux --shared --hash-style=sysv
 #objdump: -s -t -r -p -R -T
 

diff --git a/ld/testsuite/ld-cris/tls-local-61.d b/ld/testsuite/ld-cris/tls-local-61.d
index c902a8794cd971f0caaf9847eac06410e65e3ef1..1a47880c770937aae830fc802b827a26253b9c1e 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-61.d
+++ b/ld/testsuite/ld-cris/tls-local-61.d
@@ -1,5 +1,5 @@
 #source: tls-local-59.s
-#as: --pic --no-underscore --em=criself -I$srcdir/$subdir
+#as: --pic --no-underscore --emulation=criself -I$srcdir/$subdir
 #ld: -m crislinux --shared --hash-style=sysv
 #objdump: -s -t -r -p -R -T
 

diff --git a/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
index 7fde60a3eb06742673fad5cf8b784fdb68e874e5..4dcdb2ea558316f9ca1922208707f1b9789f4a8c 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-63.d
+++ b/ld/testsuite/ld-cris/tls-local-63.d
@@ -1,6 +1,6 @@
 #source: tls-ie-8.s --pic
 #source: tls-hx.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 6 -x 8 -x 5
 

diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index ec0b0ea5d352a0cea1a87e4a3ae715a85cc763ea..38f90c8610717611d80650d37b5a3972256b6ebb 100644 (file)
--- a/ld/testsuite/ld-cris/tls-local-64.d
+++ b/ld/testsuite/ld-cris/tls-local-64.d
@@ -1,7 +1,7 @@
 #source: tls-ie-8.s --pic
 #source: tls128.s
 #source: tls-hx.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 6 -x 8 -x 5
 

diff --git a/ld/testsuite/ld-cris/tls-ok-30.d b/ld/testsuite/ld-cris/tls-ok-30.d
index b5f0f561f7cc62096d1b720e78e18f3a121bfac1..3e1cbcb12a8b1ef1780a6f8340507c754f82e7e3 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ok-30.d
+++ b/ld/testsuite/ld-cris/tls-ok-30.d
@@ -1,5 +1,5 @@
 #source: tls-gdgotrelm.s --defsym r=8191
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -j .got -R
 

diff --git a/ld/testsuite/ld-cris/tls-ok-32.d b/ld/testsuite/ld-cris/tls-ok-32.d
index 6f7dab0c03e3bbf8b6829b473c1c37d53b623673..64e4e076b67352f1c66fc71f9de9af47b8b948a3 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ok-32.d
+++ b/ld/testsuite/ld-cris/tls-ok-32.d
@@ -1,5 +1,5 @@
 #source: tls-dtprelm.s --defsym r=32767
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -j .got -j .text -j .tdata -R
 

diff --git a/ld/testsuite/ld-cris/tls-ok-34.d b/ld/testsuite/ld-cris/tls-ok-34.d
index ec2f7eea78b2bbc5632bdf916aaa610c9e749c6a..c5cf66f6f059cb59851b03fee18a17a4d199c16d 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ok-34.d
+++ b/ld/testsuite/ld-cris/tls-ok-34.d
@@ -1,5 +1,5 @@
 #source: tls-gottprelm.s --defsym r=8189
-#as: --no-underscore --em=criself --pic
+#as: --no-underscore --emulation=criself --pic
 #ld: --shared -m crislinux --hash-style=sysv
 #objdump: -s -j .got -R
 

diff --git a/ld/testsuite/ld-cris/tls-ok-36.d b/ld/testsuite/ld-cris/tls-ok-36.d
index fcfecb9a8c0d7b6650452f315bd1a030e4fb5609..fac6746229309e1d93a50ca8c4b8e960f21cb732 100644 (file)
--- a/ld/testsuite/ld-cris/tls-ok-36.d
+++ b/ld/testsuite/ld-cris/tls-ok-36.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: tls-tprelm.s --defsym r=32767
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux
 #objdump: -s -j .got -j .text -j .tdata
 

diff --git a/ld/testsuite/ld-cris/tls-und-38.d b/ld/testsuite/ld-cris/tls-und-38.d
index fefe38669306aa37a42b26396b020af26ed39345..07c066259c78a7103488d528d2d43308f54d9662 100644 (file)
--- a/ld/testsuite/ld-cris/tls-und-38.d
+++ b/ld/testsuite/ld-cris/tls-und-38.d
@@ -1,5 +1,5 @@
 #source: tls-gd-2.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 

diff --git a/ld/testsuite/ld-cris/tls-und-42.d b/ld/testsuite/ld-cris/tls-und-42.d
index 644607710f8ac5e0abc1ede9abf92342c70cc319..b7309a72332a76d658cf897479fe034c1f3f62f7 100644 (file)
--- a/ld/testsuite/ld-cris/tls-und-42.d
+++ b/ld/testsuite/ld-cris/tls-und-42.d
@@ -1,5 +1,5 @@
 #source: tls-ie-10.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 

diff --git a/ld/testsuite/ld-cris/tls-und-46.d b/ld/testsuite/ld-cris/tls-und-46.d
index ab62cde5d216f220fc3753b4586e67175ff198f9..1088e4204490fff4ba1025ce6f8c3b7e661f6142 100644 (file)
--- a/ld/testsuite/ld-cris/tls-und-46.d
+++ b/ld/testsuite/ld-cris/tls-und-46.d
@@ -1,5 +1,5 @@
 #source: tls-gd-1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 

diff --git a/ld/testsuite/ld-cris/tls-und-50.d b/ld/testsuite/ld-cris/tls-und-50.d
index ed35e4291c83bc38ddbe9fa27429465e60d5e2b5..2b22a21d4d6a725642f65e84b093339b935a0072 100644 (file)
--- a/ld/testsuite/ld-cris/tls-und-50.d
+++ b/ld/testsuite/ld-cris/tls-und-50.d
@@ -1,5 +1,5 @@
 #source: tls-ie-8.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --shared --hash-style=sysv
 #readelf: -a -x 7
 

diff --git a/ld/testsuite/ld-cris/undef1.d b/ld/testsuite/ld-cris/undef1.d
index cec00cb775327411c5be534d568548da8268c80e..7940c779d5cca9d06155ed1fccfb290958bfbf4d 100644 (file)
--- a/ld/testsuite/ld-cris/undef1.d
+++ b/ld/testsuite/ld-cris/undef1.d
@@ -1,6 +1,6 @@
 #source: dso-1.s
 #source: gotrel1.s --pic
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/libdso-4.so
 #objdump: -T
 

diff --git a/ld/testsuite/ld-cris/undef2.d b/ld/testsuite/ld-cris/undef2.d
index cd2c43eee4f356962a9bb6a17d244974fde6c91d..a8e6e86a75684ea0e7d29d39adbbdea95c59ef25 100644 (file)
--- a/ld/testsuite/ld-cris/undef2.d
+++ b/ld/testsuite/ld-cris/undef2.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: stabs1.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=crisaout
+#as: --emulation=crisaout
 #ld: -mcrisaout
 #error: .o:/blah/foo.c:96:\(.*\): undefined reference to `globsym1'$

diff --git a/ld/testsuite/ld-cris/undef3.d b/ld/testsuite/ld-cris/undef3.d
index e21456b2bae17e0b168884e38f62f87bdf6b554d..92c348f6f4baf9b31dd7e42870177d0ef5a0dff3 100644 (file)
--- a/ld/testsuite/ld-cris/undef3.d
+++ b/ld/testsuite/ld-cris/undef3.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: stabs1.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=criself
+#as: --emulation=criself
 #ld: -mcriself
 #error: .o:/blah/foo.c:96:\(.*\): undefined reference to `globsym1'$

diff --git a/ld/testsuite/ld-cris/v10-v32.d b/ld/testsuite/ld-cris/v10-v32.d
index d6929263523bfeaa733e4dabd058b32cb0af5325..0c41946851015d62f53189e9b6785f086911a3b4 100644 (file)
--- a/ld/testsuite/ld-cris/v10-v32.d
+++ b/ld/testsuite/ld-cris/v10-v32.d
@@ -1,7 +1,7 @@
 # notarget: cris*-*-linux-gnu
 # source: start1.s --march=v32
 # source: move-1.s --march=v0_v10
-# as: --em=criself
+# as: --emulation=criself
 # ld: -m criself
 # error: contains non-CRIS-v32 code
 

diff --git a/ld/testsuite/ld-cris/v10-va.d b/ld/testsuite/ld-cris/v10-va.d
index c6db037b9e6a65545927fc5d807aa8a6b5c7cd63..f5288bb96f50467097b0bf4784465850dc84d52e 100644 (file)
--- a/ld/testsuite/ld-cris/v10-va.d
+++ b/ld/testsuite/ld-cris/v10-va.d
@@ -1,7 +1,7 @@
 # notarget: cris*-*-linux-gnu
 # source: start1.s --march=common_v10_v32
 # source: move-1.s --march=v0_v10
-# as: --em=criself
+# as: --emulation=criself
 # ld: -m criself
 # objdump: -p
 

diff --git a/ld/testsuite/ld-cris/v32-ba-1.d b/ld/testsuite/ld-cris/v32-ba-1.d
index b4ce78d0076467bd3694d1fa0175b0ade5d99184..24c9ed80b2f79f8c06a046c9595555ff16f7249a 100644 (file)
--- a/ld/testsuite/ld-cris/v32-ba-1.d
+++ b/ld/testsuite/ld-cris/v32-ba-1.d
@@ -1,5 +1,5 @@
 # notarget: cris*-*-linux-gnu
-# as: --march=v32 --em=criself
+# as: --march=v32 --emulation=criself
 # ld: -m criself
 # objdump: -d
 

diff --git a/ld/testsuite/ld-cris/v32-bin-1.d b/ld/testsuite/ld-cris/v32-bin-1.d
index 3a8714bf7815abea2134c274643bb1a487ef9edf..3eb94b73af0c24102d8477634710bfc8ac683037 100644 (file)
--- a/ld/testsuite/ld-cris/v32-bin-1.d
+++ b/ld/testsuite/ld-cris/v32-bin-1.d
@@ -1,5 +1,5 @@
 #notarget: cris*-*-linux-gnu
-#as: --em=criself --march=v32
+#as: --emulation=criself --march=v32
 #ld: -m criself --oformat binary --defsym ext1=0x4000 --defsym ext2=0x6000
 #objdump: -s -b binary
 

diff --git a/ld/testsuite/ld-cris/v32-v10.d b/ld/testsuite/ld-cris/v32-v10.d
index a96120faf0e21aabb879fdd6deaac5023b224653..23995b27173d47cc781242516c0d2ccf6b761b16 100644 (file)
--- a/ld/testsuite/ld-cris/v32-v10.d
+++ b/ld/testsuite/ld-cris/v32-v10.d
@@ -1,7 +1,7 @@
 # notarget: cris*-*-linux-gnu
 # source: start1.s --march=v0_v10
 # source: move-1.s --march=v32
-# as: --em=criself
+# as: --emulation=criself
 # ld: -m criself
 # error: contains CRIS v32 code
 

diff --git a/ld/testsuite/ld-cris/v32-va.d b/ld/testsuite/ld-cris/v32-va.d
index 526d3c381bb5b9f6b9cc3a8983902bf8b0ed8d4e..28d1c9eccb6c694295b17e9ea8f49318de1e3d8b 100644 (file)
--- a/ld/testsuite/ld-cris/v32-va.d
+++ b/ld/testsuite/ld-cris/v32-va.d
@@ -1,7 +1,7 @@
 # notarget: cris*-*-linux-gnu
 # source: start1.s --march=common_v10_v32
 # source: move-1.s --march=v32
-# as: --em=criself
+# as: --emulation=criself
 # ld: -m criself
 # objdump: -p
 

diff --git a/ld/testsuite/ld-cris/va-v10.d b/ld/testsuite/ld-cris/va-v10.d
index d6bda585e3563895da3619eba46640aef1447060..94579f39af548ac026e7d87a0447fd6ad0b8f52c 100644 (file)
--- a/ld/testsuite/ld-cris/va-v10.d
+++ b/ld/testsuite/ld-cris/va-v10.d
@@ -1,7 +1,7 @@
 # notarget: cris*-*-linux-gnu
 # source: start1.s --march=v0_v10
 # source: move-1.s --march=common_v10_v32
-# as: --em=criself
+# as: --emulation=criself
 # ld: -m criself
 # objdump: -p
 

diff --git a/ld/testsuite/ld-cris/va-v32.d b/ld/testsuite/ld-cris/va-v32.d
index b598ff5e55307640e75fdc25881de91f2d0b59db..8c16b052c1deeaef87180b473630ece6f32b7e3c 100644 (file)
--- a/ld/testsuite/ld-cris/va-v32.d
+++ b/ld/testsuite/ld-cris/va-v32.d
@@ -1,7 +1,7 @@
 # notarget: cris*-*-linux-gnu
 # source: start1.s --march=v32
 # source: move-1.s --march=common_v10_v32
-# as: --em=criself
+# as: --emulation=criself
 # ld: -m criself
 # objdump: -p
 

diff --git a/ld/testsuite/ld-cris/warn1.d b/ld/testsuite/ld-cris/warn1.d
index ecdf19e0187847d9481212b5b778715e67681a24..7ba922552ea2a32071c8d26198485fc33adb1448 100644 (file)
--- a/ld/testsuite/ld-cris/warn1.d
+++ b/ld/testsuite/ld-cris/warn1.d
@@ -2,7 +2,7 @@
 #source: globsym1ref.s
 #source: globsymw1.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=crisaout
+#as: --emulation=crisaout
 #ld: -mcrisaout
 #objdump: -p
 # There should be no warning, since the symbol warned about is

diff --git a/ld/testsuite/ld-cris/warn2.d b/ld/testsuite/ld-cris/warn2.d
index 96f089e328cca93edaa8df8ad2145cbcf1ba6f6e..dd48f8cb5a6cfb54420886899f993057db4e064f 100644 (file)
--- a/ld/testsuite/ld-cris/warn2.d
+++ b/ld/testsuite/ld-cris/warn2.d
@@ -2,7 +2,7 @@
 #source: globsym1ref.s
 #source: globsymw1.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=criself
+#as: --emulation=criself
 #ld: -mcriself
 #objdump: -p
 # There should be no warning, since the symbol warned about is

diff --git a/ld/testsuite/ld-cris/warn3.d b/ld/testsuite/ld-cris/warn3.d
index 8cd143565c5da42d84539f422faeaf3a4eb4fa6b..3f87fcc8b2b9c29d59047cf7eb7c46997b7cf393 100644 (file)
--- a/ld/testsuite/ld-cris/warn3.d
+++ b/ld/testsuite/ld-cris/warn3.d
@@ -2,7 +2,7 @@
 #source: globsym1ref.s
 #source: globsymw2.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=crisaout
+#as: --emulation=crisaout
 #ld: -mcrisaout
 #warning: warning: isatty is not implemented, will always fail$
 #objdump: -p

diff --git a/ld/testsuite/ld-cris/warn4.d b/ld/testsuite/ld-cris/warn4.d
index dc096b639fbaece3eb01ff8c23a91a4ed5050ec1..cc1ebb58c588ae23a5b216e2f4faf460e87a6ea5 100644 (file)
--- a/ld/testsuite/ld-cris/warn4.d
+++ b/ld/testsuite/ld-cris/warn4.d
@@ -2,7 +2,7 @@
 #source: globsym1ref.s
 #source: globsymw2.s
 #target: cris-*-*elf* cris-*-*aout*
-#as: --em=criself
+#as: --emulation=criself
 #ld: -mcriself
 #warning: warning: isatty is not implemented and will always fail$
 #objdump: -p

diff --git a/ld/testsuite/ld-cris/weakhiddso.d b/ld/testsuite/ld-cris/weakhiddso.d
index f4776d6c193a1df44aa393c8ab803807fbd84372..41d21a76099279673cdf48a13a925c5bf30ecefc 100644 (file)
--- a/ld/testsuite/ld-cris/weakhiddso.d
+++ b/ld/testsuite/ld-cris/weakhiddso.d
@@ -1,5 +1,5 @@
 #source: weakhid.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: --shared -m crislinux -z nocombreloc --hash-style=sysv
 #objdump: -s -R -T
 

diff --git a/ld/testsuite/ld-cris/weakref1.d b/ld/testsuite/ld-cris/weakref1.d
index 6dab5e40f930ad0b424a2476ea31fbfb0778cf0d..53697e2a3bafd4a24eb735e3f1ade6c4cd522d49 100644 (file)
--- a/ld/testsuite/ld-cris/weakref1.d
+++ b/ld/testsuite/ld-cris/weakref1.d
@@ -1,5 +1,5 @@
 #source: gotrel2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/libdso-1.so
 #objdump: -R
 

diff --git a/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
index fa9689bcc71ec170c5ea5aa8faeeb2b37bd7e1d2..00ac443a217562e838fad6507c1cbd244ed02a12 100644 (file)
--- a/ld/testsuite/ld-cris/weakref2.d
+++ b/ld/testsuite/ld-cris/weakref2.d
@@ -1,5 +1,5 @@
 #source: gotrel2.s
-#as: --pic --no-underscore --em=criself
+#as: --pic --no-underscore --emulation=criself
 #ld: -m crislinux tmpdir/libdso-1.so --hash-style=sysv
 #objdump: -s -j .got
 

diff --git a/ld/testsuite/ld-cris/weakref3.d b/ld/testsuite/ld-cris/weakref3.d
index 46ac80c2dbe103b11f9b2cc5ccb4e4ce0dca4658..a4a55b4e614d5a4cd47aa34897ba4fe332ec69ce 100644 (file)
--- a/ld/testsuite/ld-cris/weakref3.d
+++ b/ld/testsuite/ld-cris/weakref3.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: expdref3.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #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 520191f33cab8d42bceaeab2deabe02a9b89a776..9012bdc007eb3d1db7474d88741663ca03c7745d 100644 (file)
--- a/ld/testsuite/ld-cris/weakref4.d
+++ b/ld/testsuite/ld-cris/weakref4.d
@@ -1,6 +1,6 @@
 #source: start1.s
 #source: expdref4.s
-#as: --no-underscore --em=criself
+#as: --no-underscore --emulation=criself
 #ld: -m crislinux --hash-style=sysv
 #ld_after_inputfiles: tmpdir/libdso-15.so
 #readelf: -a -x 11