From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jbeulich@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1386)
 id 24DB53858D28; Fri,  6 Jan 2023 12:36:49 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 24DB53858D28
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Jan Beulich <jbeulich@sourceware.org>
To: bfd-cvs@sourceware.org
Subject: [binutils-gdb] ld: yet another PDB build fix (or workaround)
X-Act-Checkin: binutils-gdb
X-Git-Author: Jan Beulich <jbeulich@suse.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 59e1f50fefaf54bd1bd01aa71ad890f7c7a47ca9
X-Git-Newrev: 47bb5b33f742b4338bfa9608288830aecb085da4
Message-Id: <20230106123649.24DB53858D28@sourceware.org>
Date: Fri,  6 Jan 2023 12:36:49 +0000 (GMT)
X-BeenThere: binutils-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Binutils-cvs mailing list <binutils-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/binutils-cvs>,
 <mailto:binutils-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/binutils-cvs/>
List-Help: <mailto:binutils-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/binutils-cvs>,
 <mailto:binutils-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2023 12:36:49 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D47bb5b33f742=
b4338bfa9608288830aecb085da4

commit 47bb5b33f742b4338bfa9608288830aecb085da4
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri Jan 6 13:36:39 2023 +0100

    ld: yet another PDB build fix (or workaround)
   =20
    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.

Diff:
---
 ld/emultempl/pe.em  | 20 ++++++++++++--------
 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 bce1d1b9052..323724b84f5 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -15,13 +15,6 @@ case ${target} in
     ;;
 esac
=20
-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=3D" ";;
-  *)
-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
=20
 /* 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 69b1c3ec79b..6ac70f9cfa4 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -17,13 +17,6 @@ case ${target} in
     ;;
 esac
=20
-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=3D" ";;
-  *)
-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
=20
 /* FIXME: See bfd/peXXigen.c for why we include an architecture specific
    header in generic PE code.  */