[binutils-gdb] Fix the linker's merge4 test for the HPPA architecture.

[binutils-gdb] Fix the linker's merge4 test for the HPPA architecture.

[Nick Clifton]

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

commit 2b56cd91911c7b813b7fe9f92fb86af404356001
Author: Nick Clifton <nickc@redhat.com>
Date:   Wed Feb 15 09:26:10 2023 +0000

    Fix the linker's merge4 test for the HPPA architecture.
    
     PR 30078 * testsuite/ld-elf/merge4b.s: Use .asciz instead of .string in order to avoid the special behaviour of the .string directive on HPPA architectures.

Diff:
---
 ld/ChangeLog                  |  7 +++++++
 ld/testsuite/ld-elf/merge4b.s | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 8204ab507ea..ac2c913f3cd 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-15  Nick Clifton  <nickc@redhat.com>
+
+	PR 30078
+	* testsuite/ld-elf/merge4b.s: Use .asciz instead of .string in
+	order to avoid the special behaviour of the .string directive on
+	HPPA architectures.
+
 2023-02-14  Nick Clifton  <nickc@redhat.com>
 
 	* ld.texi (Plugins): Mention that the -plugin command line option
diff --git a/ld/testsuite/ld-elf/merge4b.s b/ld/testsuite/ld-elf/merge4b.s
index d4b66aab5e6..03cfaaabcec 100644
--- a/ld/testsuite/ld-elf/merge4b.s
+++ b/ld/testsuite/ld-elf/merge4b.s
@@ -1,11 +1,11 @@
 /* Check that pointing into padding zeros of string sections works. */
 	.section	.rodata.str1.1,"aMS",@progbits,1
-	.string ""
+	.asciz ""
 .LC0:
-	.string	"foobar"
+	.asciz	"foobar"
 1:
-	.string ""
-	.string "whatever"
+	.asciz ""
+	.asciz "whatever"
 	.section .data
 	.globl addr_of_str
 	.type addr_of_str, @object
@@ -19,5 +19,5 @@ addr_of_str2:
 	.type	str, @object
 	.size	str, 7
 str:
-	.string	"foobar"
+	.asciz	"foobar"
 	.section	.note.GNU-stack,"",@progbits