From b8a0c930580775e54bccdfdc77046db74331bad4 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Sat, 26 Aug 2023 10:36:54 +0930
Subject: ld STRINGIFY

Delete support for old compilers that don't support string
concatentation.

	* Makefile.am (stringify.sed): Delete rule.
	(GEN_DEPENDS, DISTCLEANFILES): Adjust.
	* configure.ac (STRINGIFY): Delete.
	* emultempl/beos.em: Use stringify.sed from srcdir.
	* emultempl/elf.em: Likewise.
	* emultempl/generic.em: Likewise.
	* emultempl/msp430.em: Likewise.
	* emultempl/pdp11.em: Likewise.
	* emultempl/pe.em: Likewise.
	* emultempl/pep.em: Likewise.
	* emultempl/stringify.sed: Renamed from..
	* emultempl/astring.sed: ..this.
	* emultempl/ostring.sed: Delete.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
---
 ld/emultempl/astring.sed   | 13 -------------
 ld/emultempl/beos.em       |  2 +-
 ld/emultempl/elf.em        |  2 +-
 ld/emultempl/generic.em    |  2 +-
 ld/emultempl/msp430.em     |  2 +-
 ld/emultempl/ostring.sed   |  4 ----
 ld/emultempl/pdp11.em      |  2 +-
 ld/emultempl/pe.em         |  2 +-
 ld/emultempl/pep.em        |  2 +-
 ld/emultempl/stringify.sed | 13 +++++++++++++
 10 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 ld/emultempl/astring.sed
 delete mode 100644 ld/emultempl/ostring.sed
 create mode 100644 ld/emultempl/stringify.sed

(limited to 'ld/emultempl')

diff --git a/ld/emultempl/astring.sed b/ld/emultempl/astring.sed
deleted file mode 100644
index 08bd8a6..0000000
--- a/ld/emultempl/astring.sed
+++ /dev/null
@@ -1,13 +0,0 @@
-s/["\\]/\\&/g
-s/$/\\n\\/
-1 s/^/"/
-25s/\\$/"/
-26s/^/"/
-50s/\\$/"/
-51s/^/"/
-75s/\\$/"/
-76s/^/"/
-100s/\\$/"/
-101s/^/"/
-$ s/$/n"/
-$ s/\\n"n"$/\\n"/
diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index 521d927..e597f34 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -718,7 +718,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
index 3f67f8b..1c5030d 100644
--- a/ld/emultempl/elf.em
+++ b/ld/emultempl/elf.em
@@ -199,7 +199,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/generic.em b/ld/emultempl/generic.em
index c280ed3..b37a1e7 100644
--- a/ld/emultempl/generic.em
+++ b/ld/emultempl/generic.em
@@ -86,7 +86,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/msp430.em b/ld/emultempl/msp430.em
index 33fff78..65be045 100644
--- a/ld/emultempl/msp430.em
+++ b/ld/emultempl/msp430.em
@@ -104,7 +104,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/ostring.sed b/ld/emultempl/ostring.sed
deleted file mode 100644
index a526d3f..0000000
--- a/ld/emultempl/ostring.sed
+++ /dev/null
@@ -1,4 +0,0 @@
-s/["\\]/\\&/g
-s/$/\\n\\/
-1 s/^/"/
-$ s/$/n"/
diff --git a/ld/emultempl/pdp11.em b/ld/emultempl/pdp11.em
index c6dbdee..f5d2f4f 100644
--- a/ld/emultempl/pdp11.em
+++ b/ld/emultempl/pdp11.em
@@ -101,7 +101,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 36f60d5..24dc19a 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -2511,7 +2511,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index 1df959a..289c72e 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -2342,7 +2342,7 @@ then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+sc="-f ${srcdir}/emultempl/stringify.sed"
 
 fragment <<EOF
 {
diff --git a/ld/emultempl/stringify.sed b/ld/emultempl/stringify.sed
new file mode 100644
index 0000000..08bd8a6
--- /dev/null
+++ b/ld/emultempl/stringify.sed
@@ -0,0 +1,13 @@
+s/["\\]/\\&/g
+s/$/\\n\\/
+1 s/^/"/
+25s/\\$/"/
+26s/^/"/
+50s/\\$/"/
+51s/^/"/
+75s/\\$/"/
+76s/^/"/
+100s/\\$/"/
+101s/^/"/
+$ s/$/n"/
+$ s/\\n"n"$/\\n"/
-- 
cgit v1.1