[PATCH] elf: Rename is_standard_elf to uses_elf_em

[PATCH] elf: Rename is_standard_elf to uses_elf_em

[H.J. Lu]

Rename is_standard_elf to uses_elf_em for targets which use elf.em.

binutils/

	PR ld/31289
	* testsuite/lib/binutils-common.exp (is_standard_elf): Renamed
	to ...
	(uses_elf_em): This.

ld/

	PR ld/31289
	* testsuite/ld-elf/fatal-warnings-2a.d: Replace is_standard_elf
	with uses_elf_em.
	* testsuite/ld-elf/fatal-warnings-2b.d: Likewise.
	* testsuite/ld-elf/fatal-warnings-3a.d: Likewise.
	* testsuite/ld-elf/fatal-warnings-3b.d: Likewise.
	* testsuite/ld-elf/fatal-warnings-4a.d: Likewise.
	* testsuite/ld-elf/fatal-warnings-4b.d: Likewise.
---
 binutils/testsuite/lib/binutils-common.exp | 4 ++--
 ld/testsuite/ld-elf/fatal-warnings-2a.d    | 2 +-
 ld/testsuite/ld-elf/fatal-warnings-2b.d    | 2 +-
 ld/testsuite/ld-elf/fatal-warnings-3a.d    | 2 +-
 ld/testsuite/ld-elf/fatal-warnings-3b.d    | 2 +-
 ld/testsuite/ld-elf/fatal-warnings-4a.d    | 2 +-
 ld/testsuite/ld-elf/fatal-warnings-4b.d    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index b304801e718..2fca43bac48 100644
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -275,8 +275,8 @@ proc is_generic { } {
     return 0
 }
 
-# Return true if target uses the standard ELF emulation.
-proc is_standard_elf { } {
+# Return true if target uses elf.em.
+proc uses_elf_em { } {
     if { ![is_elf_format] || [is_generic] } {
 	return 0
     }
diff --git a/ld/testsuite/ld-elf/fatal-warnings-2a.d b/ld/testsuite/ld-elf/fatal-warnings-2a.d
index b17abb1b274..55a0abe126e 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-2a.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-2a.d
@@ -2,5 +2,5 @@
 #source: start.s
 #ld: -z bad-option1 -z bad-option2
 #warning: -z bad-option1 ignored
-#xfail: ![is_standard_elf]
+#xfail: ![uses_elf_em]
 # These targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/fatal-warnings-2b.d b/ld/testsuite/ld-elf/fatal-warnings-2b.d
index 7aedb531dd4..701e4fb7c97 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-2b.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-2b.d
@@ -2,5 +2,5 @@
 #source: start.s
 #ld: -z bad-option1 -z bad-option2
 #warning: -z bad-option2 ignored
-#xfail: ![is_standard_elf]
+#xfail: ![uses_elf_em]
 # These targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/fatal-warnings-3a.d b/ld/testsuite/ld-elf/fatal-warnings-3a.d
index 1b52f8fe0c5..0a31a733e50 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-3a.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-3a.d
@@ -2,5 +2,5 @@
 #source: start.s
 #ld: --fatal-warnings -z bad-option1 -z bad-option2
 #error: unsupported option: -z bad-option1
-#xfail: ![is_standard_elf]
+#xfail: ![uses_elf_em]
 # These targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/fatal-warnings-3b.d b/ld/testsuite/ld-elf/fatal-warnings-3b.d
index 870a1eb2fea..7ab86168c62 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-3b.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-3b.d
@@ -2,5 +2,5 @@
 #source: start.s
 #ld: --fatal-warnings -z bad-option1 -z bad-option2
 #error: unsupported option: -z bad-option2
-#xfail: ![is_standard_elf]
+#xfail: ![uses_elf_em]
 # These targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/fatal-warnings-4a.d b/ld/testsuite/ld-elf/fatal-warnings-4a.d
index cf7373b4625..6befcda9c55 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-4a.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-4a.d
@@ -2,5 +2,5 @@
 #source: start.s
 #ld: -z bad-option1 -z bad-option2 --fatal-warnings
 #error: unsupported option: -z bad-option1
-#xfail: ![is_standard_elf]
+#xfail: ![uses_elf_em]
 # These targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/fatal-warnings-4b.d b/ld/testsuite/ld-elf/fatal-warnings-4b.d
index 7cdb2b4db7a..072993265db 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-4b.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-4b.d
@@ -2,5 +2,5 @@
 #source: start.s
 #ld: -z bad-option1 -z bad-option2 --fatal-warnings
 #error: unsupported option: -z bad-option2
-#xfail: ![is_standard_elf]
+#xfail: ![uses_elf_em]
 # These targets don't support -z options.
-- 
2.43.0

Re: [PATCH] elf: Rename is_standard_elf to uses_elf_em

[Nick Clifton]

Hi H.J.

> Rename is_standard_elf to uses_elf_em for targets which use elf.em.
> 
> binutils/
> 
> 	PR ld/31289
> 	* testsuite/lib/binutils-common.exp (is_standard_elf): Renamed
> 	to ...
> 	(uses_elf_em): This.
> 
> ld/
> 
> 	PR ld/31289
> 	* testsuite/ld-elf/fatal-warnings-2a.d: Replace is_standard_elf
> 	with uses_elf_em.
> 	* testsuite/ld-elf/fatal-warnings-2b.d: Likewise.
> 	* testsuite/ld-elf/fatal-warnings-3a.d: Likewise.
> 	* testsuite/ld-elf/fatal-warnings-3b.d: Likewise.
> 	* testsuite/ld-elf/fatal-warnings-4a.d: Likewise.

Approved - please apply.

Cheers
   Nick