[binutils-gdb] cris/testsuite: don't use --em=

[Jan Beulich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=52be9c1ba31dc509641db681c5bdb607b9230192

commit 52be9c1ba31dc509641db681c5bdb607b9230192
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri Jul 4 10:40:31 2025 +0200

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

Diff:
---
 gas/testsuite/gas/cris/mulbug-err-1.s        | 2 +-
 gas/testsuite/gas/cris/pic-err-1.s           | 2 +-
 gas/testsuite/gas/cris/pic-err-2.s           | 2 +-
 gas/testsuite/gas/cris/rd-abs32-1.d          | 2 +-
 gas/testsuite/gas/cris/rd-abs32-2.d          | 2 +-
 gas/testsuite/gas/cris/rd-arch-1.d           | 2 +-
 gas/testsuite/gas/cris/rd-arch-2.d           | 2 +-
 gas/testsuite/gas/cris/rd-arch-3.d           | 2 +-
 gas/testsuite/gas/cris/rd-bcnst-pic.d        | 2 +-
 gas/testsuite/gas/cris/rd-bcnst2-pic.d       | 2 +-
 gas/testsuite/gas/cris/rd-bcnst2.d           | 2 +-
 gas/testsuite/gas/cris/rd-bkw1b.d            | 2 +-
 gas/testsuite/gas/cris/rd-bkw2b.d            | 2 +-
 gas/testsuite/gas/cris/rd-bkw3b.d            | 2 +-
 gas/testsuite/gas/cris/rd-bkw4.d             | 2 +-
 gas/testsuite/gas/cris/rd-bkw4v32.d          | 2 +-
 gas/testsuite/gas/cris/rd-bkw5.d             | 2 +-
 gas/testsuite/gas/cris/rd-bkw5b.d            | 2 +-
 gas/testsuite/gas/cris/rd-bkw5bpic.d         | 2 +-
 gas/testsuite/gas/cris/rd-bkw5bv32.d         | 2 +-
 gas/testsuite/gas/cris/rd-bkw5bv32pic.d      | 2 +-
 gas/testsuite/gas/cris/rd-bkw5pic.d          | 2 +-
 gas/testsuite/gas/cris/rd-bkw5v32.d          | 2 +-
 gas/testsuite/gas/cris/rd-bkw5v32pic.d       | 2 +-
 gas/testsuite/gas/cris/rd-bound1.d           | 2 +-
 gas/testsuite/gas/cris/rd-bound2.d           | 2 +-
 gas/testsuite/gas/cris/rd-bound3.d           | 2 +-
 gas/testsuite/gas/cris/rd-bound4.d           | 2 +-
 gas/testsuite/gas/cris/rd-branch-pic.d       | 2 +-
 gas/testsuite/gas/cris/rd-break32.d          | 2 +-
 gas/testsuite/gas/cris/rd-brokw-pic-3.d      | 2 +-
 gas/testsuite/gas/cris/rd-dtpoffd1.d         | 2 +-
 gas/testsuite/gas/cris/rd-dw2-1.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-10.d           | 2 +-
 gas/testsuite/gas/cris/rd-dw2-11.d           | 2 +-
 gas/testsuite/gas/cris/rd-dw2-12.d           | 2 +-
 gas/testsuite/gas/cris/rd-dw2-13.d           | 2 +-
 gas/testsuite/gas/cris/rd-dw2-14.d           | 2 +-
 gas/testsuite/gas/cris/rd-dw2-15.d           | 2 +-
 gas/testsuite/gas/cris/rd-dw2-2.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-3.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-4.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-5.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-6.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-7.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-8.d            | 2 +-
 gas/testsuite/gas/cris/rd-dw2-9.d            | 2 +-
 gas/testsuite/gas/cris/rd-mulbug-1.d         | 2 +-
 gas/testsuite/gas/cris/rd-pcplus.d           | 2 +-
 gas/testsuite/gas/cris/rd-pcrel2.d           | 2 +-
 gas/testsuite/gas/cris/rd-pic-1.d            | 2 +-
 gas/testsuite/gas/cris/rd-pic-2.d            | 2 +-
 gas/testsuite/gas/cris/rd-ppv1032.d          | 2 +-
 gas/testsuite/gas/cris/rd-ppv32.d            | 2 +-
 gas/testsuite/gas/cris/rd-regprefix-1b.d     | 2 +-
 gas/testsuite/gas/cris/rd-spr-1.d            | 2 +-
 gas/testsuite/gas/cris/rd-tls-1.d            | 2 +-
 gas/testsuite/gas/cris/rd-tls-2.d            | 2 +-
 gas/testsuite/gas/cris/rd-usp-1b.d           | 2 +-
 gas/testsuite/gas/cris/rd-v10_32o-1.d        | 2 +-
 gas/testsuite/gas/cris/rd-v10_32o-2.d        | 2 +-
 gas/testsuite/gas/cris/rd-v32-b1.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-b2.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-b3.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-f1.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-i1.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-l1.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-l3.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32-l4.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32o-1.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32s-1.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32s-2.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32s-3.d           | 2 +-
 gas/testsuite/gas/cris/rd-v32s-4.d           | 2 +-
 gas/testsuite/gas/cris/rd-vao-1.d            | 2 +-
 gas/testsuite/gas/cris/tls-err-1.s           | 2 +-
 gas/testsuite/gas/cris/tls-err-2.s           | 2 +-
 gas/testsuite/gas/cris/tls-err-3.s           | 2 +-
 gas/testsuite/gas/cris/us-err-1.s            | 2 +-
 gas/testsuite/gas/cris/us-err-3.s            | 2 +-
 gas/testsuite/gas/cris/v32-err-2.s           | 2 +-
 gas/testsuite/gas/cris/v32-err-7.s           | 2 +-
 ld/testsuite/ld-cris/asneed1.d               | 2 +-
 ld/testsuite/ld-cris/badgotr1.d              | 2 +-
 ld/testsuite/ld-cris/def2.d                  | 2 +-
 ld/testsuite/ld-cris/def3.d                  | 2 +-
 ld/testsuite/ld-cris/dso-pltdis1.d           | 2 +-
 ld/testsuite/ld-cris/dso-pltdis2.d           | 2 +-
 ld/testsuite/ld-cris/dso12-pltdis.d          | 2 +-
 ld/testsuite/ld-cris/expdyn1.d               | 2 +-
 ld/testsuite/ld-cris/expdyn2.d               | 2 +-
 ld/testsuite/ld-cris/expdyn3.d               | 2 +-
 ld/testsuite/ld-cris/expdyn4.d               | 2 +-
 ld/testsuite/ld-cris/expdyn5.d               | 2 +-
 ld/testsuite/ld-cris/expdyn6.d               | 2 +-
 ld/testsuite/ld-cris/expdyn7.d               | 2 +-
 ld/testsuite/ld-cris/gotplt1.d               | 2 +-
 ld/testsuite/ld-cris/gotplt2.d               | 2 +-
 ld/testsuite/ld-cris/gotplt3.d               | 2 +-
 ld/testsuite/ld-cris/hiddef1.d               | 2 +-
 ld/testsuite/ld-cris/ldsym1.d                | 2 +-
 ld/testsuite/ld-cris/libdso-1.d              | 2 +-
 ld/testsuite/ld-cris/libdso-10.d             | 2 +-
 ld/testsuite/ld-cris/libdso-11.d             | 2 +-
 ld/testsuite/ld-cris/libdso-12.d             | 2 +-
 ld/testsuite/ld-cris/libdso-12b.d            | 2 +-
 ld/testsuite/ld-cris/libdso-12c.d            | 2 +-
 ld/testsuite/ld-cris/libdso-13.d             | 2 +-
 ld/testsuite/ld-cris/libdso-13b.d            | 2 +-
 ld/testsuite/ld-cris/libdso-14.d             | 2 +-
 ld/testsuite/ld-cris/libdso-15.d             | 2 +-
 ld/testsuite/ld-cris/libdso-15b.d            | 2 +-
 ld/testsuite/ld-cris/libdso-15c.d            | 2 +-
 ld/testsuite/ld-cris/libdso-1b.d             | 2 +-
 ld/testsuite/ld-cris/libdso-1c.d             | 2 +-
 ld/testsuite/ld-cris/libdso-1d.d             | 2 +-
 ld/testsuite/ld-cris/libdso-2.d              | 2 +-
 ld/testsuite/ld-cris/libdso-3.d              | 2 +-
 ld/testsuite/ld-cris/libdso-4.d              | 2 +-
 ld/testsuite/ld-cris/locref1.d               | 2 +-
 ld/testsuite/ld-cris/locref2.d               | 2 +-
 ld/testsuite/ld-cris/nodyn4.d                | 2 +-
 ld/testsuite/ld-cris/nodyn5.d                | 2 +-
 ld/testsuite/ld-cris/pcrelcp-1.d             | 2 +-
 ld/testsuite/ld-cris/pic-gc-72.d             | 2 +-
 ld/testsuite/ld-cris/pic-gc-73.d             | 2 +-
 ld/testsuite/ld-cris/pr16044.d               | 2 +-
 ld/testsuite/ld-cris/pr26589.d               | 2 +-
 ld/testsuite/ld-cris/pv32-1.d                | 2 +-
 ld/testsuite/ld-cris/tls-dso-dtpoffd2.d      | 2 +-
 ld/testsuite/ld-cris/tls-dso-dtpoffd4.d      | 2 +-
 ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d | 2 +-
 ld/testsuite/ld-cris/tls-dso-x1x2-1.d        | 2 +-
 ld/testsuite/ld-cris/tls-dso-xz-1.d          | 2 +-
 ld/testsuite/ld-cris/tls-e-20.d              | 2 +-
 ld/testsuite/ld-cris/tls-e-20a.d             | 2 +-
 ld/testsuite/ld-cris/tls-e-21.d              | 2 +-
 ld/testsuite/ld-cris/tls-e-22.d              | 2 +-
 ld/testsuite/ld-cris/tls-e-23.d              | 2 +-
 ld/testsuite/ld-cris/tls-e-66.d              | 2 +-
 ld/testsuite/ld-cris/tls-e-80.d              | 2 +-
 ld/testsuite/ld-cris/tls-e-dtpoffd1.d        | 2 +-
 ld/testsuite/ld-cris/tls-e-dtpoffd3.d        | 2 +-
 ld/testsuite/ld-cris/tls-e-tpiecomm1.d       | 2 +-
 ld/testsuite/ld-cris/tls-e-tpoffcomm1.d      | 2 +-
 ld/testsuite/ld-cris/tls-e-tpoffgotcomm1.d   | 2 +-
 ld/testsuite/ld-cris/tls-err-20x.d           | 2 +-
 ld/testsuite/ld-cris/tls-err-24.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-25.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-26.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-27.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-28.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-29.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-31.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-33.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-35.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-37.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-39.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-40.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-41.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-43.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-44.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-45.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-47.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-48.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-49.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-51.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-52.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-53.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-55.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-56.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-62.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-65.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-67.d            | 2 +-
 ld/testsuite/ld-cris/tls-err-77.d            | 2 +-
 ld/testsuite/ld-cris/tls-gc-68.d             | 2 +-
 ld/testsuite/ld-cris/tls-gc-69.d             | 2 +-
 ld/testsuite/ld-cris/tls-gc-70.d             | 2 +-
 ld/testsuite/ld-cris/tls-gc-71.d             | 2 +-
 ld/testsuite/ld-cris/tls-gc-75.d             | 2 +-
 ld/testsuite/ld-cris/tls-gc-76.d             | 2 +-
 ld/testsuite/ld-cris/tls-gc-79.d             | 2 +-
 ld/testsuite/ld-cris/tls-gd-1.d              | 2 +-
 ld/testsuite/ld-cris/tls-gd-1h.d             | 2 +-
 ld/testsuite/ld-cris/tls-gd-2.d              | 2 +-
 ld/testsuite/ld-cris/tls-gd-2h.d             | 2 +-
 ld/testsuite/ld-cris/tls-gd-3.d              | 2 +-
 ld/testsuite/ld-cris/tls-gd-3h.d             | 2 +-
 ld/testsuite/ld-cris/tls-global-74.d         | 2 +-
 ld/testsuite/ld-cris/tls-ie-10.d             | 2 +-
 ld/testsuite/ld-cris/tls-ie-11.d             | 2 +-
 ld/testsuite/ld-cris/tls-ie-78.d             | 2 +-
 ld/testsuite/ld-cris/tls-ie-8.d              | 2 +-
 ld/testsuite/ld-cris/tls-ie-8e1.d            | 2 +-
 ld/testsuite/ld-cris/tls-ie-9.d              | 2 +-
 ld/testsuite/ld-cris/tls-js1.d               | 2 +-
 ld/testsuite/ld-cris/tls-ld-4.d              | 2 +-
 ld/testsuite/ld-cris/tls-ld-5.d              | 2 +-
 ld/testsuite/ld-cris/tls-ld-6.d              | 2 +-
 ld/testsuite/ld-cris/tls-ld-7.d              | 2 +-
 ld/testsuite/ld-cris/tls-ldgd-14.d           | 2 +-
 ld/testsuite/ld-cris/tls-ldgd-15.d           | 2 +-
 ld/testsuite/ld-cris/tls-ldgde-14.d          | 2 +-
 ld/testsuite/ld-cris/tls-ldgde-15.d          | 2 +-
 ld/testsuite/ld-cris/tls-ldgdex-14.d         | 2 +-
 ld/testsuite/ld-cris/tls-ldgdex-15.d         | 2 +-
 ld/testsuite/ld-cris/tls-ldgdx-14.d          | 2 +-
 ld/testsuite/ld-cris/tls-ldgdx-15.d          | 2 +-
 ld/testsuite/ld-cris/tls-le-12.d             | 2 +-
 ld/testsuite/ld-cris/tls-le-12s.d            | 2 +-
 ld/testsuite/ld-cris/tls-le-13.d             | 2 +-
 ld/testsuite/ld-cris/tls-le-13s.d            | 2 +-
 ld/testsuite/ld-cris/tls-legd-16.d           | 2 +-
 ld/testsuite/ld-cris/tls-legd-17.d           | 2 +-
 ld/testsuite/ld-cris/tls-legdx-16.d          | 2 +-
 ld/testsuite/ld-cris/tls-legdx-17.d          | 2 +-
 ld/testsuite/ld-cris/tls-leie-18.d           | 2 +-
 ld/testsuite/ld-cris/tls-leie-19.d           | 2 +-
 ld/testsuite/ld-cris/tls-local-54.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-57.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-58.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-59.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-60.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-61.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-63.d          | 2 +-
 ld/testsuite/ld-cris/tls-local-64.d          | 2 +-
 ld/testsuite/ld-cris/tls-ok-30.d             | 2 +-
 ld/testsuite/ld-cris/tls-ok-32.d             | 2 +-
 ld/testsuite/ld-cris/tls-ok-34.d             | 2 +-
 ld/testsuite/ld-cris/tls-ok-36.d             | 2 +-
 ld/testsuite/ld-cris/tls-und-38.d            | 2 +-
 ld/testsuite/ld-cris/tls-und-42.d            | 2 +-
 ld/testsuite/ld-cris/tls-und-46.d            | 2 +-
 ld/testsuite/ld-cris/tls-und-50.d            | 2 +-
 ld/testsuite/ld-cris/undef1.d                | 2 +-
 ld/testsuite/ld-cris/undef2.d                | 2 +-
 ld/testsuite/ld-cris/undef3.d                | 2 +-
 ld/testsuite/ld-cris/v10-v32.d               | 2 +-
 ld/testsuite/ld-cris/v10-va.d                | 2 +-
 ld/testsuite/ld-cris/v32-ba-1.d              | 2 +-
 ld/testsuite/ld-cris/v32-bin-1.d             | 2 +-
 ld/testsuite/ld-cris/v32-v10.d               | 2 +-
 ld/testsuite/ld-cris/v32-va.d                | 2 +-
 ld/testsuite/ld-cris/va-v10.d                | 2 +-
 ld/testsuite/ld-cris/va-v32.d                | 2 +-
 ld/testsuite/ld-cris/warn1.d                 | 2 +-
 ld/testsuite/ld-cris/warn2.d                 | 2 +-
 ld/testsuite/ld-cris/warn3.d                 | 2 +-
 ld/testsuite/ld-cris/warn4.d                 | 2 +-
 ld/testsuite/ld-cris/weakhiddso.d            | 2 +-
 ld/testsuite/ld-cris/weakref1.d              | 2 +-
 ld/testsuite/ld-cris/weakref2.d              | 2 +-
 ld/testsuite/ld-cris/weakref3.d              | 2 +-
 ld/testsuite/ld-cris/weakref4.d              | 2 +-
 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 b8a0d9ca0ac..c966e180964 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 a27981c6795..6adf909da92 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 1720054b56a..eff165a2fc3 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 aee95ff5c33..f57ae174414 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 20fc30205ae..d1b6646becc 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 12c6c6ee7a5..152b8c9622c 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 69e5b6fb541..a6590206673 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 022c1f01cc1..2c051ba2552 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 365a6a4c723..bf5ac1425d7 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 c1e11a10357..3428b496477 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 019218501f7..327185c02ae 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 19e9d71b299..706370aa9d8 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 1d268b3a44c..0165f004c22 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 4a7cca9bb2e..b46dc04ca49 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 73d56b08ca2..6481615e81c 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 35fa5b2230a..8ec82ede4c2 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 da501346acb..961400d1a69 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 f26758324c1..6a5d97c25eb 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 c83bf2bf1d0..7429c0c8507 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 1b87c3ee569..7f539c307f8 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 a63ab512a98..800f1e1e5f3 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 e22d8932d5d..1027f11c859 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 5b1a90ddeea..c50acc0dc60 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 9998db44076..0bba23fd352 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 40bfd34b8c3..468dff0fc8f 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 e0aec151f7c..f9926d942b5 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 874c29016e8..dfad3b11093 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 1b0670ab268..56af3b7a3ec 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 4c6b59abc79..d57c60bce07 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 ba7c518e057..daeb8863c6a 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 bf3170cb25f..2d57b4174a5 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 b5c657313aa..7bc35e9af30 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 fcf3170c0aa..915ac8c8027 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 0ca9208b71d..dfc555fa9d3 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 67d57dcb20e..b3287c4b025 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 a1c48957e5d..f3c4e6a70d7 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 42c9b527577..fc59c923cf5 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 dabbc15ede6..e5539a277f6 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 b4bdd686e85..b09cf95a592 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 a567e118943..67b726bcf66 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 aec1c7c7c21..325fe02c2d1 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 6614eb6a14c..bc8931678c6 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 e9664f10856..6bbbbf6de12 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 1c2051bdcb6..3d0b408abc5 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 d463ebb2acf..1ac16c2a3a0 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 a50de2fb925..2aaa4fbb355 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 0f2a12c4667..9020d05b431 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 42ac192a6a7..9eaeb5d022a 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 7cbd2aed197..db8bd155d22 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 2b401e7a0f1..1972b37bacb 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 aab93a5d502..c180dd2d2da 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 ce75451cd11..7c6da568c8b 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 4f64ce1938f..1a5bd50c39d 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 52355ffe228..e512e6ca0bd 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 2c3a625f287..ca588b735cc 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 a7f28c70f56..fc5417eb759 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 aec9c50a73b..2d25aca7b9a 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 c68638149eb..0882160755b 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 40a92fe0541..9da67768e4a 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 d9f43531a6b..61c00277390 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 73c240f13b0..2a695a99def 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 52823994de8..2ded58befdf 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 9439b9e8591..e7fa79695d2 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 fee75df97c6..6b7d18374a3 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 d97c38e3b62..fa69a703aa0 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 def1e49900f..75d490d7f9f 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 231f0e7ac5e..72a8c6edc7f 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 59a8174419b..33b369d3db6 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 4afd3fb9a93..f7af48b9b69 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 24bfcda1170..0cae6802e2d 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 b4f85be8c4d..dbfad959ae6 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 446cadc2915..6c55456dc03 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 27d75aa6dc5..bae88589933 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 516dcc8a1c5..9bd6dcd55ba 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 14b68bdd0ca..dfdc7dce9b3 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 d4fd8d47cbc..3194e2ddba8 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 d320651421a..c37df02b4d0 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 cbc2b5da513..1eaa563398e 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 cbe7618910a..a13d4c1b4ab 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 54ff9f3037b..61431ae3bd5 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 0a5a3767f3e..59bf4996cda 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 72b65033cdc..4f13d88928c 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 00fba758223..b40356de53f 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 f7a5ac84654..a993e90f90b 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 ff75d88a123..00c5f4182f8 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 e1ae3c5eb2e..231414b8186 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 efc4d94aaf6..96140338bc2 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 c6f53fd26ea..e9673868514 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 429f91e2d19..e5a230c6dae 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 37cbe4dce9c..0c1ea55bedd 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 6c5faa5991b..b2a6fb3de55 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 34f2a5efeae..aefbe84f336 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 e93205669a1..55101423001 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 818ee4f5bae..0c4dfd0d1b3 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 cf4a5783260..c315d953e81 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 6028343a4f3..a5d52d19ecb 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 163bb018d34..96ea5e167e1 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 32d0f89db35..32c515fbb15 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 abc0192c3fc..7dd85627d3a 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 602f1bfe461..7cbe876bf62 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 e8dcd325e0e..2aacf3acc2a 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 5a7e9a16549..ba5d3b0bd72 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 0f0d56264bf..696b16e09e4 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 0e00ad6e70a..f95ca4fbeea 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 7fe83427be0..1bf459644f9 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 215d1886c35..a133f1132d9 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 949a0e7c103..484630ea525 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 b50a5afc97c..ad320190e21 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 cf8200e3c1c..b592a9c3ba1 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 b87a5cec83f..ce4b8adb90f 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 e772fa37d24..6f9b5752945 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 d02619bd7bc..161a58e6611 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 b0359905c24..3adb9529657 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 56e57885575..6d88e1398dd 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 d69b857c531..218f296a17c 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 83a43372edb..7755b0e2c5a 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 900d00d8c24..7133dd53d26 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 9e18c59e1ab..c02eb3d63fd 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 3d573951e1a..11a85a121d9 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 ac26b28ea4e..da5d86ce4ae 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 0cf53946cb5..4f8712b419a 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 c1af092bf6e..9a20173dfa4 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 28b581e097b..0130fa566a9 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 0d5f6b8ae9c..7152308cfbd 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 3c096eab3fc..269a5d2033f 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 603ce4559fe..bafe4839c5b 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 9bb264b881d..59e90bb2699 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 aee31434ca2..17da49a00a6 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 3b17e2352a7..0d9a9241d03 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 46ad8ab952b..cd999813b32 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 a8f13051955..b1792e8c966 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 a5911131bbe..fcdfe4ee298 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 61687019198..29e3ed74fa2 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 9a33b78cc94..87a016501cf 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 eb323a59804..d192e840409 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 7d5a95e8b26..5680184cf15 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 80ca3e37f77..33c2214a0c2 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 93ab45da7b4..c49a4b49bc1 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 a09d55ef901..ae07bb27c70 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 ba1755d3fa6..f556ddf3004 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 15ce3d7838b..919be62c66d 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 5da24b53d51..3d07dbc1f02 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 6013a3a1e22..f6195987b5e 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 2e0f0f0b92e..0360790b5a6 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 4fc067eb790..4300a22f8d7 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 9d34f683b4e..a0501e9641b 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 9a3af03192d..06661dcfbe5 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 08678700f90..504b76e47f6 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 e162d6e8e05..6f049f2f391 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 45ebfe272ff..e8f18a316e2 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 ce5592499d7..876e5adc32b 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 8ccd40b0f76..4edf9f93c28 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 e0d73271778..d5c9d756e2e 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 b7484ad5fea..ccc5027aa29 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 329fae1e585..d3fb23196f1 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 b203e359913..7d7a3719983 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 a41dd0a7550..10a2cc28377 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 fbdc698d5e3..a666fcb8155 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 91b4165c468..8bcd356012c 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 0c4705f7b36..b74bbb8448f 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 bb3abb42358..de5eb4c8ceb 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 941e21c5976..f70a965924f 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 28faa306846..dedab8f6691 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 4f7139bebbd..035ca1e9287 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 756f1b595c2..5530c34bc94 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 5d8a9c97e33..6509560dacd 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 3891aacc23e..efe5f3cac4d 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 b2f85cf9ac2..9aeb260a226 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 89884be0cad..31f3a3c2f80 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 32f05176845..10a801662cc 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 8a68dd19654..d46e27ede3d 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 da64d1c1f16..1e1800032c4 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 62958a229ce..0de5e51ecbc 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 6a010e1f5af..a1493e56352 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 6b7696bacfd..2888da36d34 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 c1a7d25c803..a2c04f103f7 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 ef02437a7d6..3714efb0ac5 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 74d0d1373f4..b6c5c7642aa 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 343204e7ead..c6f35ca23f3 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 f377dc263e7..2ce0fcf85b9 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 2bcf25c27ea..01d37c9e588 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 a5bd7ffe37d..92fce152fce 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 5156a27dc2c..61d58048e12 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 e0123042360..242f3acbf7a 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 107687cc93d..989fa561601 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 f5eaa8b20f9..1041de4f47a 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 b2de85103bc..d9ed9dec39e 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 898a670e164..69455e620c3 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 b70c6a95b1b..e0b9859e01b 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 0df1e9d4af5..bf010f07078 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 3bd727a6b3c..8a43359270e 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 ae9862c875b..7e477490368 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 4af78fbac8a..deed73f7f25 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 0093935a79e..2666e3e4b0f 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 c1b5b1a1e74..5334dc5eb7f 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 f007ea4cf58..099d0461a39 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 ea1fc29d827..2d2c7c59e96 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 5d423aad4f3..f2bb06e1ee2 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 21dbabefa96..db00c15be95 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 e0fb31e8523..7f89a907e4f 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 0c1d48658fb..1a93a47c53a 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 7916d3111ea..a51e8ff9b03 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 9eada3eb2ae..0f2d90df968 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 d5e993dfeea..8b3c6ed40aa 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 86a8d4e9865..b96e6de66ef 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 0a4e527325e..0589a3514d8 100644
--- a/l[...]

[diff truncated at 100000 bytes]