diff options
| author | Jan Beulich <jbeulich@suse.com> | 2023-01-06 13:36:39 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2023-01-06 13:36:39 +0100 |
| commit | 47bb5b33f742b4338bfa9608288830aecb085da4 (patch) | |
| tree | 17afba6c50350fcd528d9ae62f015fbacd089b56 | |
| parent | 59e1f50fefaf54bd1bd01aa71ad890f7c7a47ca9 (diff) | |
| download | gdb-47bb5b33f742b4338bfa9608288830aecb085da4.zip gdb-47bb5b33f742b4338bfa9608288830aecb085da4.tar.gz gdb-47bb5b33f742b4338bfa9608288830aecb085da4.tar.bz2 | |
ld: yet another PDB build fix (or workaround)
Older bash looks to improperly deal with backslashes in here-documents,
leaving them in place on the escaped double quotes inside the parameter
expansion. Convert to a model without using such a construct, by simply
splitting the here-documents into three ones.
| -rw-r--r-- | ld/emultempl/pe.em | 20 | ||||
| -rw-r--r-- | ld/emultempl/pep.em | 20 |
2 files changed, 24 insertions, 16 deletions
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index bce1d1b..323724b 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -15,13 +15,6 @@ case ${target} in ;; esac -case ${target} in - x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \ - i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe) - pdb_support=" ";; - *) -esac - rm -f e${EMULATION_NAME}.c (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-) fragment <<EOF @@ -73,7 +66,18 @@ fragment <<EOF #include "ldctor.h" #include "ldbuildid.h" #include "coff/internal.h" -${pdb_support+#include \"pdb.h\"} +EOF + +case ${target} in + x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \ + i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe) +fragment <<EOF +#include "pdb.h" +EOF + ;; +esac + +fragment <<EOF /* FIXME: See bfd/peXXigen.c for why we include an architecture specific header in generic PE code. */ diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 69b1c3e..6ac70f9 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -17,13 +17,6 @@ case ${target} in ;; esac -case ${target} in - x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \ - i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe) - pdb_support=" ";; - *) -esac - rm -f e${EMULATION_NAME}.c (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-) fragment <<EOF @@ -82,7 +75,18 @@ fragment <<EOF #include "ldctor.h" #include "ldbuildid.h" #include "coff/internal.h" -${pdb_support+#include \"pdb.h\"} +EOF + +case ${target} in + x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \ + i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe) +fragment <<EOF +#include "pdb.h" +EOF + ;; +esac + +fragment <<EOF /* FIXME: See bfd/peXXigen.c for why we include an architecture specific header in generic PE code. */ |