diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2001-05-24 02:44:06 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2001-05-24 02:44:06 +0000 |
| commit | 57e6abd2770d71f8f9dd3bd29befc19ccc2e8ad1 (patch) | |
| tree | 05b4631917b75c59553703985d6cdc7b0486c36f /ld | |
| parent | f6dc23a9315643df7775395ab7518490e5da6a1c (diff) | |
| download | gdb-57e6abd2770d71f8f9dd3bd29befc19ccc2e8ad1.zip gdb-57e6abd2770d71f8f9dd3bd29befc19ccc2e8ad1.tar.gz gdb-57e6abd2770d71f8f9dd3bd29befc19ccc2e8ad1.tar.bz2 | |
* emultempl/elf32.em (ELF_INTERPRETER_SET_DEFAULT): Use this new
variable to avoid non-portable shell construct.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 22 |
2 files changed, 18 insertions, 9 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index d5f5eb5..80be489 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2001-05-23 Alexandre Oliva <aoliva@redhat.com> + + * emultempl/elf32.em (ELF_INTERPRETER_SET_DEFAULT): Use this new + variable to avoid non-portable shell construct. + 2001-05-23 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> * ldmain.c (get_emulation): Add -mips5 command line argument. diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 0b38c1f..c5ffe14 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -789,6 +789,18 @@ gld${EMULATION_NAME}_find_statement_assignment (s) EOF if test x"$LDEMUL_BEFORE_ALLOCATION" != xgld"$EMULATION_NAME"_before_allocation; then + if test x"${ELF_INTERPRETER_NAME+set}" = xset; then + ELF_INTERPRETER_SET_DEFAULT=" + if (sinterp != NULL) + { + sinterp->contents = ${ELF_INTERPRETER_NAME}; + sinterp->_raw_size = strlen (sinterp->contents) + 1; + } + +" + else + ELF_INTERPRETER_SET_DEFAULT= + fi cat >>e${EMULATION_NAME}.c <<EOF /* This is called after the sections have been attached to output @@ -816,15 +828,7 @@ gld${EMULATION_NAME}_before_allocation () (const char * const *) command_line.auxiliary_filters, &link_info, &sinterp, lang_elf_version_info))) einfo ("%P%F: failed to set dynamic section sizes: %E\n"); - -${ELF_INTERPRETER_NAME+" - if (sinterp != NULL) - { - sinterp->contents = ${ELF_INTERPRETER_NAME}; - sinterp->_raw_size = strlen (sinterp->contents) + 1; - } - -"} +${ELF_INTERPRETER_SET_DEFAULT} /* Let the user override the dynamic linker we are using. */ if (command_line.interpreter != NULL && sinterp != NULL) |