[binutils-gdb] s390: Fix linker s390 emulation option parsing

[Jens Remus]

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

commit 6af6a9497b1d45df3af99629d3c3d77139fb9fba
Author: Jens Remus <jremus@linux.ibm.com>
Date:   Mon Jan 27 16:47:10 2025 +0100

    s390: Fix linker s390 emulation option parsing
    
    Append s390-specific emulation options to the shell variables instead of
    replacing their contents.
    
    ld/
            * emultempl/s390.em (PARSE_AND_LIST_LONGOPTS,
            PARSE_AND_LIST_OPTIONS, PARSE_AND_LIST_ARGS_CASES): Append to
            emulation options instead of replacing them.
    
    Fixes: b4cbbe8f7294 ("S/390: Add support for pgste marker")
    Signed-off-by: Jens Remus <jremus@linux.ibm.com>

Diff:
---
 ld/emultempl/s390.em | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ld/emultempl/s390.em b/ld/emultempl/s390.em
index 3a2e49d80a7..8548768cc5f 100644
--- a/ld/emultempl/s390.em
+++ b/ld/emultempl/s390.em
@@ -42,16 +42,16 @@ EOF
 # Define some shell vars to insert bits of code into the standard elf
 # parse_args and list_options functions.
 #
-PARSE_AND_LIST_LONGOPTS='
+PARSE_AND_LIST_LONGOPTS=${PARSE_AND_LIST_LONGOPTS}'
   { "s390-pgste", no_argument, NULL, OPTION_PGSTE},
 '
 
-PARSE_AND_LIST_OPTIONS='
+PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
   fprintf (file, _("  --s390-pgste                Tell the kernel to "
 		   "allocate 4k page tables\n"));
 '
 
-PARSE_AND_LIST_ARGS_CASES='
+PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
     case OPTION_PGSTE:
       params.pgste = 1;
       break;