aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2025-07-04 10:40:31 +0200
committerJan Beulich <jbeulich@suse.com>2025-07-04 10:40:31 +0200
commit52be9c1ba31dc509641db681c5bdb607b9230192 (patch)
tree466c87be8a0be1f827b6f3751aae236d4dc3a0a4
parentdfce0d9e38a8b4f9bfc12bf457d3181625581f86 (diff)
downloadbinutils-52be9c1ba31dc509641db681c5bdb607b9230192.zip
binutils-52be9c1ba31dc509641db681c5bdb607b9230192.tar.gz
binutils-52be9c1ba31dc509641db681c5bdb607b9230192.tar.bz2
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.
-rw-r--r--gas/testsuite/gas/cris/mulbug-err-1.s2
-rw-r--r--gas/testsuite/gas/cris/pic-err-1.s2
-rw-r--r--gas/testsuite/gas/cris/pic-err-2.s2
-rw-r--r--gas/testsuite/gas/cris/rd-abs32-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-abs32-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-arch-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-arch-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-arch-3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bcnst-pic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bcnst2-pic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bcnst2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw1b.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw2b.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw3b.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw4.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw4v32.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5b.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5bpic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5bv32.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5bv32pic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5pic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5v32.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bkw5v32pic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bound1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bound2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bound3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-bound4.d2
-rw-r--r--gas/testsuite/gas/cris/rd-branch-pic.d2
-rw-r--r--gas/testsuite/gas/cris/rd-break32.d2
-rw-r--r--gas/testsuite/gas/cris/rd-brokw-pic-3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dtpoffd1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-10.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-11.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-12.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-13.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-14.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-15.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-4.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-5.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-6.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-7.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-8.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dw2-9.d2
-rw-r--r--gas/testsuite/gas/cris/rd-mulbug-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-pcplus.d2
-rw-r--r--gas/testsuite/gas/cris/rd-pcrel2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-pic-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-pic-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-ppv1032.d2
-rw-r--r--gas/testsuite/gas/cris/rd-ppv32.d2
-rw-r--r--gas/testsuite/gas/cris/rd-regprefix-1b.d2
-rw-r--r--gas/testsuite/gas/cris/rd-spr-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-tls-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-tls-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-usp-1b.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v10_32o-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v10_32o-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-b1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-b2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-b3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-f1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-i1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-l1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-l3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32-l4.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32o-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32s-1.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32s-2.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32s-3.d2
-rw-r--r--gas/testsuite/gas/cris/rd-v32s-4.d2
-rw-r--r--gas/testsuite/gas/cris/rd-vao-1.d2
-rw-r--r--gas/testsuite/gas/cris/tls-err-1.s2
-rw-r--r--gas/testsuite/gas/cris/tls-err-2.s2
-rw-r--r--gas/testsuite/gas/cris/tls-err-3.s2
-rw-r--r--gas/testsuite/gas/cris/us-err-1.s2
-rw-r--r--gas/testsuite/gas/cris/us-err-3.s2
-rw-r--r--gas/testsuite/gas/cris/v32-err-2.s2
-rw-r--r--gas/testsuite/gas/cris/v32-err-7.s2
-rw-r--r--ld/testsuite/ld-cris/asneed1.d2
-rw-r--r--ld/testsuite/ld-cris/badgotr1.d2
-rw-r--r--ld/testsuite/ld-cris/def2.d2
-rw-r--r--ld/testsuite/ld-cris/def3.d2
-rw-r--r--ld/testsuite/ld-cris/dso-pltdis1.d2
-rw-r--r--ld/testsuite/ld-cris/dso-pltdis2.d2
-rw-r--r--ld/testsuite/ld-cris/dso12-pltdis.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn1.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn2.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn3.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn4.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn5.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn6.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn7.d2
-rw-r--r--ld/testsuite/ld-cris/gotplt1.d2
-rw-r--r--ld/testsuite/ld-cris/gotplt2.d2
-rw-r--r--ld/testsuite/ld-cris/gotplt3.d2
-rw-r--r--ld/testsuite/ld-cris/hiddef1.d2
-rw-r--r--ld/testsuite/ld-cris/ldsym1.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-1.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-10.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-11.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-12.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-12b.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-12c.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-13.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-13b.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-14.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-15.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-15b.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-15c.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-1b.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-1c.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-1d.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-2.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-3.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-4.d2
-rw-r--r--ld/testsuite/ld-cris/locref1.d2
-rw-r--r--ld/testsuite/ld-cris/locref2.d2
-rw-r--r--ld/testsuite/ld-cris/nodyn4.d2
-rw-r--r--ld/testsuite/ld-cris/nodyn5.d2
-rw-r--r--ld/testsuite/ld-cris/pcrelcp-1.d2
-rw-r--r--ld/testsuite/ld-cris/pic-gc-72.d2
-rw-r--r--ld/testsuite/ld-cris/pic-gc-73.d2
-rw-r--r--ld/testsuite/ld-cris/pr16044.d2
-rw-r--r--ld/testsuite/ld-cris/pr26589.d2
-rw-r--r--ld/testsuite/ld-cris/pv32-1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-dso-dtpoffd2.d2
-rw-r--r--ld/testsuite/ld-cris/tls-dso-dtpoffd4.d2
-rw-r--r--ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-dso-x1x2-1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-dso-xz-1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-20.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-20a.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-21.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-22.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-23.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-66.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-80.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-dtpoffd1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-dtpoffd3.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-tpiecomm1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-tpoffcomm1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-e-tpoffgotcomm1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-20x.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-24.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-25.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-26.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-27.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-28.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-29.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-31.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-33.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-35.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-37.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-39.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-40.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-41.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-43.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-44.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-45.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-47.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-48.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-49.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-51.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-52.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-53.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-55.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-56.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-62.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-65.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-67.d2
-rw-r--r--ld/testsuite/ld-cris/tls-err-77.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-68.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-69.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-70.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-71.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-75.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-76.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gc-79.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gd-1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gd-1h.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gd-2.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gd-2h.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gd-3.d2
-rw-r--r--ld/testsuite/ld-cris/tls-gd-3h.d2
-rw-r--r--ld/testsuite/ld-cris/tls-global-74.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ie-10.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ie-11.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ie-78.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ie-8.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ie-8e1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ie-9.d2
-rw-r--r--ld/testsuite/ld-cris/tls-js1.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ld-4.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ld-5.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ld-6.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ld-7.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgd-14.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgd-15.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgde-14.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgde-15.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgdex-14.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgdex-15.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgdx-14.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ldgdx-15.d2
-rw-r--r--ld/testsuite/ld-cris/tls-le-12.d2
-rw-r--r--ld/testsuite/ld-cris/tls-le-12s.d2
-rw-r--r--ld/testsuite/ld-cris/tls-le-13.d2
-rw-r--r--ld/testsuite/ld-cris/tls-le-13s.d2
-rw-r--r--ld/testsuite/ld-cris/tls-legd-16.d2
-rw-r--r--ld/testsuite/ld-cris/tls-legd-17.d2
-rw-r--r--ld/testsuite/ld-cris/tls-legdx-16.d2
-rw-r--r--ld/testsuite/ld-cris/tls-legdx-17.d2
-rw-r--r--ld/testsuite/ld-cris/tls-leie-18.d2
-rw-r--r--ld/testsuite/ld-cris/tls-leie-19.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-54.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-57.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-58.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-59.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-60.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-61.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-63.d2
-rw-r--r--ld/testsuite/ld-cris/tls-local-64.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ok-30.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ok-32.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ok-34.d2
-rw-r--r--ld/testsuite/ld-cris/tls-ok-36.d2
-rw-r--r--ld/testsuite/ld-cris/tls-und-38.d2
-rw-r--r--ld/testsuite/ld-cris/tls-und-42.d2
-rw-r--r--ld/testsuite/ld-cris/tls-und-46.d2
-rw-r--r--ld/testsuite/ld-cris/tls-und-50.d2
-rw-r--r--ld/testsuite/ld-cris/undef1.d2
-rw-r--r--ld/testsuite/ld-cris/undef2.d2
-rw-r--r--ld/testsuite/ld-cris/undef3.d2
-rw-r--r--ld/testsuite/ld-cris/v10-v32.d2
-rw-r--r--ld/testsuite/ld-cris/v10-va.d2
-rw-r--r--ld/testsuite/ld-cris/v32-ba-1.d2
-rw-r--r--ld/testsuite/ld-cris/v32-bin-1.d2
-rw-r--r--ld/testsuite/ld-cris/v32-v10.d2
-rw-r--r--ld/testsuite/ld-cris/v32-va.d2
-rw-r--r--ld/testsuite/ld-cris/va-v10.d2
-rw-r--r--ld/testsuite/ld-cris/va-v32.d2
-rw-r--r--ld/testsuite/ld-cris/warn1.d2
-rw-r--r--ld/testsuite/ld-cris/warn2.d2
-rw-r--r--ld/testsuite/ld-cris/warn3.d2
-rw-r--r--ld/testsuite/ld-cris/warn4.d2
-rw-r--r--ld/testsuite/ld-cris/weakhiddso.d2
-rw-r--r--ld/testsuite/ld-cris/weakref1.d2
-rw-r--r--ld/testsuite/ld-cris/weakref2.d2
-rw-r--r--ld/testsuite/ld-cris/weakref3.d2
-rw-r--r--ld/testsuite/ld-cris/weakref4.d2
254 files changed, 254 insertions, 254 deletions
diff --git a/gas/testsuite/gas/cris/mulbug-err-1.s b/gas/testsuite/gas/cris/mulbug-err-1.s
index b8a0d9c..c966e18 100644
--- 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 a27981c..6adf909 100644
--- 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 1720054..eff165a 100644
--- 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 aee95ff..f57ae17 100644
--- 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 20fc302..d1b6646 100644
--- 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 12c6c6e..152b8c9 100644
--- 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 69e5b6f..a659020 100644
--- 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 022c1f0..2c051ba 100644
--- 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 365a6a4..bf5ac14 100644
--- 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 c1e11a1..3428b49 100644
--- 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 0192185..327185c 100644
--- 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 19e9d71..706370a 100644
--- 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 1d268b3..0165f00 100644
--- 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 4a7cca9..b46dc04 100644
--- 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 73d56b0..6481615 100644
--- 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 35fa5b2..8ec82ed 100644
--- 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 da50134..961400d 100644
--- 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 f267583..6a5d97c 100644
--- 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 c83bf2b..7429c0c 100644
--- 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 1b87c3e..7f539c3 100644
--- 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 a63ab51..800f1e1 100644
--- 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 e22d893..1027f11 100644
--- 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 5b1a90d..c50acc0 100644
--- 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 9998db4..0bba23f 100644
--- 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 40bfd34..468dff0 100644
--- 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 e0aec15..f9926d9 100644
--- 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 874c290..dfad3b1 100644
--- 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 1b0670a..56af3b7 100644
--- 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 4c6b59a..d57c60b 100644
--- 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 ba7c518..daeb886 100644
--- 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 bf3170c..2d57b41 100644
--- 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 b5c6573..7bc35e9 100644
--- 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 fcf3170..915ac8c 100644
--- 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 0ca9208..dfc555f 100644
--- 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 67d57dc..b3287c4 100644
--- 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 a1c4895..f3c4e6a 100644
--- 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 42c9b52..fc59c92 100644
--- 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 dabbc15..e5539a2 100644
--- 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 b4bdd68..b09cf95 100644
--- 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 a567e11..67b726b 100644
--- 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 aec1c7c..325fe02 100644
--- 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 6614eb6..bc89316 100644
--- 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 e9664f1..6bbbbf6 100644
--- 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 1c2051b..3d0b408 100644
--- 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 d463ebb..1ac16c2 100644
--- 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 a50de2f..2aaa4fb 100644
--- 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 0f2a12c..9020d05 100644
--- 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 42ac192..9eaeb5d 100644
--- 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 7cbd2ae..db8bd15 100644
--- 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 2b401e7..1972b37 100644
--- 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 aab93a5..c180dd2 100644
--- 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 ce75451..7c6da56 100644
--- 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 4f64ce1..1a5bd50 100644
--- 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 52355ff..e512e6c 100644
--- 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 2c3a625..ca588b7 100644
--- 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 a7f28c7..fc5417e 100644
--- 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 aec9c50..2d25aca 100644
--- 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 c686381..0882160 100644
--- 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 40a92fe..9da6776 100644
--- 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 d9f4353..61c0027 100644
--- 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 73c240f..2a695a9 100644
--- 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 5282399..2ded58b 100644
--- 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 9439b9e..e7fa796 100644
--- 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 fee75df..6b7d183 100644
--- 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 d97c38e..fa69a70 100644
--- 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 def1e49..75d490d 100644
--- 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 231f0e7..72a8c6e 100644
--- 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 59a8174..33b369d 100644
--- 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 4afd3fb..f7af48b 100644
--- 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 24bfcda..0cae680 100644
--- 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 b4f85be..dbfad95 100644
--- 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 446cadc..6c55456 100644
--- 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 27d75aa..bae8858 100644
--- 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 516dcc8..9bd6dcd 100644
--- 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 14b68bd..dfdc7dc 100644
--- 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 d4fd8d4..3194e2d 100644
--- 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 d320651..c37df02 100644
--- 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 cbc2b5d..1eaa563 100644
--- 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 cbe7618..a13d4c1 100644
--- 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 54ff9f3..61431ae 100644
--- 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 0a5a376..59bf499 100644
--- 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 72b6503..4f13d88 100644
--- 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 00fba75..b40356d 100644
--- 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 f7a5ac8..a993e90 100644
--- 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 ff75d88..00c5f41 100644
--- 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 e1ae3c5..231414b 100644
--- 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 efc4d94..9614033 100644
--- 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 c6f53fd..e967386 100644
--- 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 429f91e..e5a230c 100644
--- 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 37cbe4d..0c1ea55 100644
--- 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 6c5faa5..b2a6fb3 100644
--- 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 34f2a5e..aefbe84 100644
--- 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 e932056..5510142 100644
--- 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 818ee4f..0c4dfd0 100644
--- 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 cf4a578..c315d95 100644
--- 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 6028343..a5d52d1 100644
--- 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 163bb01..96ea5e1 100644
--- 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 32d0f89..32c515f 100644
--- 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 abc0192..7dd8562 100644
--- 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 602f1bf..7cbe876 100644
--- 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 e8dcd32..2aacf3a 100644
--- 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 5a7e9a1..ba5d3b0 100644
--- 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 0f0d562..696b16e 100644
--- 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 0e00ad6..f95ca4f 100644
--- 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 7fe8342..1bf4596 100644
--- 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 215d188..a133f11 100644
--- 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 949a0e7..484630e 100644
--- 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 b50a5af..ad32019 100644
--- 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 cf8200e..b592a9c 100644
--- 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 b87a5ce..ce4b8ad 100644
--- 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 e772fa3..6f9b575 100644
--- 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 d02619b..161a58e 100644
--- 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 b035990..3adb952 100644
--- 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 56e5788..6d88e13 100644
--- 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 d69b857..218f296 100644
--- 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 83a4337..7755b0e 100644
--- 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 900d00d..7133dd5 100644
--- 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 9e18c59..c02eb3d 100644
--- 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 3d57395..11a85a1 100644
--- 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 ac26b28..da5d86c 100644
--- 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 0cf5394..4f8712b 100644
--- 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 c1af092..9a20173 100644
--- 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 28b581e..0130fa5 100644
--- 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 0d5f6b8..7152308 100644
--- 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 3c096ea..269a5d2 100644
--- 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 603ce45..bafe483 100644
--- 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 9bb264b..59e90bb 100644
--- 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 aee3143..17da49a 100644
--- 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 3b17e23..0d9a924 100644
--- 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 46ad8ab..cd99981 100644
--- 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 a8f1305..b1792e8 100644
--- 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 a591113..fcdfe4e 100644
--- 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 6168701..29e3ed7 100644
--- 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 9a33b78..87a0165 100644
--- 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 eb323a5..d192e84 100644
--- 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 7d5a95e..5680184 100644
--- 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 80ca3e3..33c2214 100644
--- 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 93ab45d..c49a4b4 100644
--- 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 a09d55e..ae07bb2 100644
--- 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 ba1755d..f556ddf 100644
--- 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 15ce3d7..919be62 100644
--- 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 5da24b5..3d07dbc 100644
--- 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 6013a3a..f619598 100644
--- 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 2e0f0f0..0360790 100644
--- 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 4fc067e..4300a22 100644
--- 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 9d34f68..a0501e9 100644
--- 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 9a3af03..06661dc 100644
--- 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 0867870..504b76e 100644
--- 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 e162d6e..6f049f2 100644
--- 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 45ebfe2..e8f18a3 100644
--- 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 ce55924..876e5ad 100644
--- 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 8ccd40b..4edf9f9 100644
--- 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 e0d7327..d5c9d75 100644
--- 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 b7484ad..ccc5027 100644
--- 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 329fae1..d3fb231 100644
--- 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 b203e35..7d7a371 100644
--- 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 a41dd0a..10a2cc2 100644
--- 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 fbdc698..a666fcb 100644
--- 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 91b4165..8bcd356 100644
--- 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 0c4705f..b74bbb8 100644
--- 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 bb3abb4..de5eb4c 100644
--- 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 941e21c..f70a965 100644
--- 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 28faa30..dedab8f 100644
--- 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 4f7139b..035ca1e 100644
--- 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 756f1b5..5530c34 100644
--- 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 5d8a9c9..6509560 100644
--- 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 3891aac..efe5f3c 100644
--- 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 b2f85cf..9aeb260 100644
--- 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 89884be..31f3a3c 100644
--- 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 32f0517..10a8016 100644
--- 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 8a68dd1..d46e27e 100644
--- 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 da64d1c..1e18000 100644
--- 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 62958a2..0de5e51 100644
--- 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 6a010e1..a1493e5 100644
--- 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 6b7696b..2888da3 100644
--- 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 c1a7d25..a2c04f1 100644
--- 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 ef02437..3714efb 100644
--- 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 74d0d13..b6c5c76 100644
--- 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 343204e..c6f35ca 100644
--- 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 f377dc2..2ce0fcf 100644
--- 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 2bcf25c..01d37c9 100644
--- 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 a5bd7ff..92fce15 100644
--- 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 5156a27..61d5804 100644
--- 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 e012304..242f3ac 100644
--- 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 107687c..989fa56 100644
--- 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 f5eaa8b..1041de4 100644
--- 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 b2de851..d9ed9de 100644
--- 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 898a670..69455e6 100644
--- 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 b70c6a9..e0b9859 100644
--- 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 0df1e9d..bf010f0 100644
--- 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 3bd727a..8a43359 100644
--- 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 ae9862c..7e477490 100644
--- 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 4af78fb..deed73f 100644
--- 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 0093935..2666e3e 100644
--- 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 c1b5b1a..5334dc5 100644
--- 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 f007ea4..099d046 100644
--- 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 ea1fc29..2d2c7c5 100644
--- 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 5d423aa..f2bb06e 100644
--- 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 21dbabe..db00c15 100644
--- 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 e0fb31e..7f89a90 100644
--- 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 0c1d486..1a93a47 100644
--- 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 7916d31..a51e8ff 100644
--- 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 9eada3e..0f2d90d 100644
--- 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 d5e993d..8b3c6ed 100644
--- 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 86a8d4e..b96e6de 100644
--- 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 0a4e527..0589a35 100644
--- 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 a773522..d9d229e 100644
--- 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 e0b9a53..ac3dfd6 100644
--- 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 d24b21b..b5d8abf 100644
--- 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 96570e9..b69b871 100644
--- 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 3d969ac..c04de57 100644
--- 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 146c913..dc5720e 100644
--- 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 092d39e..b5fc3d7 100644
--- 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 49f2d45..f7f4421 100644
--- 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 badbeb3..11816cc 100644
--- 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 5b2c7ec..9eba531 100644
--- 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 edff43c..2285f46 100644
--- 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 859e2e6..09f5cf6 100644
--- 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 0098e56..1209cfd 100644
--- 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 cce2486..ed74fe0 100644
--- 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 d7926bd..e22b393 100644
--- 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 c37584b..ee68c3a 100644
--- 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 ce64203..acbed26 100644
--- 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 c902a87..1a47880 100644
--- 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 7fde60a..4dcdb2e 100644
--- 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 ec0b0ea..38f90c8 100644
--- 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 b5f0f56..3e1cbcb 100644
--- 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 6f7dab0..64e4e07 100644
--- 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 ec2f7ee..c5cf66f 100644
--- 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 fcfecb9..fac6746 100644
--- 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 fefe386..07c0662 100644
--- 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 6446077..b7309a7 100644
--- 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 ab62cde..1088e42 100644
--- 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 ed35e42..2b22a21 100644
--- 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 cec00cb..7940c77 100644
--- 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 cd2c43e..a8e6e86 100644
--- 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 e21456b..92c348f 100644
--- 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 d692926..0c41946 100644
--- 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 c6db037..f5288bb 100644
--- 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 b4ce78d..24c9ed8 100644
--- 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 3a8714b..3eb94b7 100644
--- 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 a96120f..23995b2 100644
--- 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 526d3c3..28d1c9e 100644
--- 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 d6bda58..94579f3 100644
--- 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 b598ff5..8c16b05 100644
--- 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 ecdf19e..7ba9225 100644
--- 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 96f089e..dd48f8c 100644
--- 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 8cd1435..3f87fcc 100644
--- 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 dc096b6..cc1ebb5 100644
--- 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 f4776d6..41d21a7 100644
--- 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 6dab5e4..53697e2 100644
--- 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 fa9689b..00ac443 100644
--- 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 46ac80c..a4a55b4 100644
--- 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 520191f..9012bdc 100644
--- 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