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 --git a/ld/ChangeLog b/ld/ChangeLog
index 8204ab507ea600d084e7c5f90fc1c20b1c8d281e..ac2c913f3cdd198629e452c5a55e3aa63c4c8f60 100644 (file)
--- 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 d4b66aab5e69d60e3ab9c2588660fd13a693ede1..03cfaaabceceb83c05e0284220ed040956ff75f7 100644 (file)
--- 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