Re: Add --enable-linker-verssion

Output sections without any input sections to initialise their flags
have their flags initialised by data statements to LOAD, ALLOC,
HAS_CONTENTS by default.  This is wrong for .comment.  Fix that by
making the script initialise the section type to INFO, one of the
noalloc section types.  That also allows the address of .comment to be
set to zero, as is usual for non-alloc sections.

Also, use source_sh for all of the sourced scripts to set up make
dependencies.

	PR 30187
	* scripttempl/misc-sections.sc: Set .comment address to zero
	and type to INFO.
	* scripttempl/ft32.sc: Fix breakages from last edit.
	* scripttempl/arclinux.sc: Use source_sh to source DWARF.sc
	and misc-sections.sc.
	* scripttempl/avr.sc: Likewise.
	* scripttempl/dlx.sc: Likewise.
	* scripttempl/elf.sc: Likewise.
	* scripttempl/elf32cr16.sc: Likewise.
	* scripttempl/elf32crx.sc: Likewise.
	* scripttempl/elf32msp430.sc: Likewise.
	* scripttempl/elf64bpf.sc: Likewise.
	* scripttempl/elf64hppa.sc: Likewise.
	* scripttempl/elf_chaos.sc: Likewise.
	* scripttempl/elfarc.sc: Likewise.
	* scripttempl/elfarcv2.sc: Likewise.
	* scripttempl/elfd10v.sc: Likewise.
	* scripttempl/elfd30v.sc: Likewise.
	* scripttempl/elfm68hc11.sc: Likewise.
	* scripttempl/elfm68hc12.sc: Likewise.
	* scripttempl/elfm9s12z.sc: Likewise.
	* scripttempl/elfmicroblaze.sc: Likewise.
	* scripttempl/elfxgate.sc: Likewise.
	* scripttempl/elfxtensa.sc: Likewise.
	* scripttempl/epiphany_4x4.sc: Likewise.
	* scripttempl/i386beos.sc: Likewise.
	* scripttempl/i386go32.sc: Likewise.
	* scripttempl/ia64vms.sc: Likewise.
	* scripttempl/ip2k.sc: Likewise.
	* scripttempl/iq2000.sc: Likewise.
	* scripttempl/mep.sc: Likewise.
	* scripttempl/mmo.sc: Likewise.
	* scripttempl/nds32elf.sc: Likewise.
	* scripttempl/pru.sc: Likewise.
	* scripttempl/v850.sc: Likewise.
	* scripttempl/v850_rh850.sc: Likewise.
	* scripttempl/visium.sc: Likewise.
	* scripttempl/xstormy16.sc: Likewise.
	* scripttempl/z80.sc: Likewise.
	* testsuite/ld-scripts/ld-version-2.d: Don't skip ft32 or pru.

diff --git a/ld/scripttempl/arclinux.sc b/ld/scripttempl/arclinux.sc
index 9c24e5bc12c6afe238d4174306315759b008e224..20429df45a82d45ad68e7fcf45e9ad577501b72a 100644 (file)
--- a/ld/scripttempl/arclinux.sc
+++ b/ld/scripttempl/arclinux.sc
@@ -656,9 +656,8 @@ EOF
 
 test -z "${NON_ALLOC_DYN}" || emit_dyn
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/avr.sc b/ld/scripttempl/avr.sc
index 3677e07eeb975d5f6db38ccae3ce82b33009bf62..61cccfccde86d287010a5d94e2d64c3cdf99d923 100644 (file)
--- a/ld/scripttempl/avr.sc
+++ b/ld/scripttempl/avr.sc
@@ -328,13 +328,13 @@ cat <<EOF
 EOF
 fi
 
-. $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
 
 cat <<EOF
   .note.gnu.build-id ${RELOCATING-0} : { *(.note.gnu.build-id) }
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/dlx.sc b/ld/scripttempl/dlx.sc
index f5673f4c05b2e1efc1b41060e6f756e5d06f215e..8d7a9d53daba15e58a96438f53399c3b7095f124 100644 (file)
--- a/ld/scripttempl/dlx.sc
+++ b/ld/scripttempl/dlx.sc
@@ -41,9 +41,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 92f100b462352621f8fc9c919a55cf99026b574d..1e3c5aa8504c3bdc4d824a8792af8fdd1993accc 100644 (file)
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -722,9 +722,8 @@ EOF
 
 test -z "${NON_ALLOC_DYN}" || emit_dyn
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/elf32cr16.sc b/ld/scripttempl/elf32cr16.sc
index aedc17bd430e240520fa290b323770d9ef281831..cefae424656fb75aac893ba97f1a4f513e5c0b7e 100644 (file)
--- a/ld/scripttempl/elf32cr16.sc
+++ b/ld/scripttempl/elf32cr16.sc
@@ -171,8 +171,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elf32crx.sc b/ld/scripttempl/elf32crx.sc
index 747bfbb1cadb628c51fc28b7cfbd3afa7844f9f8..594eaa1f4fbe45435661baecccd13671a187db01 100644 (file)
--- a/ld/scripttempl/elf32crx.sc
+++ b/ld/scripttempl/elf32crx.sc
@@ -169,8 +169,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elf32msp430.sc b/ld/scripttempl/elf32msp430.sc
index 4b0ac8d7e93ebd4c4318ca5702efa1ccda65d41e..6edc908a2a064dfaeba40ec7a4086aedf489b8fa 100644 (file)
--- a/ld/scripttempl/elf32msp430.sc
+++ b/ld/scripttempl/elf32msp430.sc
@@ -332,8 +332,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 test -n "${RELOCATING}" && cat <<EOF
   .MSP430.attributes 0 :

diff --git a/ld/scripttempl/elf64bpf.sc b/ld/scripttempl/elf64bpf.sc
index 8ff588bc1fbbbdabaee04ca2c58bb174726cbe28..74154585125106cf6dc26d11a7542b9474ed3a1b 100644 (file)
--- a/ld/scripttempl/elf64bpf.sc
+++ b/ld/scripttempl/elf64bpf.sc
@@ -679,7 +679,7 @@ EOF
 
 test -z "${NON_ALLOC_DYN}" || emit_dyn
 
-. $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/elf64hppa.sc b/ld/scripttempl/elf64hppa.sc
index e80d248363081b208b46f275431d0077c289295a..e85dd397993cca6430a5e93aae8982fc722b237f 100644 (file)
--- a/ld/scripttempl/elf64hppa.sc
+++ b/ld/scripttempl/elf64hppa.sc
@@ -533,8 +533,8 @@ if test -n "${NON_ALLOC_DYN}"; then
   rm -f ldscripts/dyntmp.$$
 fi
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/elf_chaos.sc b/ld/scripttempl/elf_chaos.sc
index f3b2776ef57933699d7fa81cc71b0081afd2f2fb..72f91c9c9fcd93bede04cd51845a25e87fe68103 100644 (file)
--- a/ld/scripttempl/elf_chaos.sc
+++ b/ld/scripttempl/elf_chaos.sc
@@ -327,8 +327,8 @@ cat <<EOF
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/elfarc.sc b/ld/scripttempl/elfarc.sc
index ccba4a1113d54964a5b731fb8d8bc0d0161c6827..57cd0a561a0c386c14499725b0ec9c01cfc286c4 100644 (file)
--- a/ld/scripttempl/elfarc.sc
+++ b/ld/scripttempl/elfarc.sc
@@ -409,8 +409,8 @@ test -n "${RELOCATING}" && cat <<EOF
   }
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   /* ARC Extension Sections */

diff --git a/ld/scripttempl/elfarcv2.sc b/ld/scripttempl/elfarcv2.sc
index 5b547c15a9f8985a023148a290c703ee3aa19f31..f1b8a69d0903178d0ac1c8f6f458bdee832244a1 100644 (file)
--- a/ld/scripttempl/elfarcv2.sc
+++ b/ld/scripttempl/elfarcv2.sc
@@ -294,8 +294,8 @@ SECTIONS
   .note.gnu.build-id : { *(.note.gnu.build-id) }
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   /* ARC Extension Sections */

diff --git a/ld/scripttempl/elfd10v.sc b/ld/scripttempl/elfd10v.sc
index c08192c9288af9673e49b03f91b6a32f72ba06a6..e52aaedeac008e67e04437c7886d48ad479881f0 100644 (file)
--- a/ld/scripttempl/elfd10v.sc
+++ b/ld/scripttempl/elfd10v.sc
@@ -174,8 +174,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elfd30v.sc b/ld/scripttempl/elfd30v.sc
index 2c95f5c16ec26afd977ceb7442b01d477d37aa95..97fafb3076466efb66931ddbe5e5f4fe2a7af367 100644 (file)
--- a/ld/scripttempl/elfd30v.sc
+++ b/ld/scripttempl/elfd30v.sc
@@ -199,8 +199,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${RELOCATING+PROVIDE (__stack = ${STACK_START_ADDR});}

diff --git a/ld/scripttempl/elfm68hc11.sc b/ld/scripttempl/elfm68hc11.sc
index e796a5f7ca089b550fc11971b5fb770d6cd75351..ea4321ceeb0279b961e56e5ecc9546386de0f427 100644 (file)
--- a/ld/scripttempl/elfm68hc11.sc
+++ b/ld/scripttempl/elfm68hc11.sc
@@ -430,8 +430,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elfm68hc12.sc b/ld/scripttempl/elfm68hc12.sc
index 6fa708977fa43820bbeaf7bfd19dfbd12445de30..a5a623b5f062dbc1c9db465ac647ab6dd1267a3c 100644 (file)
--- a/ld/scripttempl/elfm68hc12.sc
+++ b/ld/scripttempl/elfm68hc12.sc
@@ -432,7 +432,7 @@ SECTIONS
   ${RELOCATING+${VECTORS}}
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
 
 cat <<EOF
   /* Treatment of DWARF debug section must be at end of the linker
@@ -441,7 +441,7 @@ cat <<EOF
      symbols are found.  */
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elfm9s12z.sc b/ld/scripttempl/elfm9s12z.sc
index d77e2130a98ef1c4b0006c3852f29c1b95bf539f..c09b3f7d7a3e8ba0be1fd3358ef33ec4e591f402 100644 (file)
--- a/ld/scripttempl/elfm9s12z.sc
+++ b/ld/scripttempl/elfm9s12z.sc
@@ -422,7 +422,7 @@ SECTIONS
   ${RELOCATING+${VECTORS}}
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
 
 cat <<EOF
   /* Treatment of DWARF debug section must be at end of the linker
@@ -431,7 +431,7 @@ cat <<EOF
      symbols are found.  */
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elfmicroblaze.sc b/ld/scripttempl/elfmicroblaze.sc
index 6c17172bf50801a6e7553ea15d4be45336b41d4c..5121c5df3a716b86a242de8afcb46ed742b1a7af 100644 (file)
--- a/ld/scripttempl/elfmicroblaze.sc
+++ b/ld/scripttempl/elfmicroblaze.sc
@@ -234,8 +234,8 @@ SECTIONS
   }
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elfxgate.sc b/ld/scripttempl/elfxgate.sc
index f810788929e037b9e9da0517bcafc187cda55803..2655e8924f7fc8bdbf3fa846ca38e21495bf5ae0 100644 (file)
--- a/ld/scripttempl/elfxgate.sc
+++ b/ld/scripttempl/elfxgate.sc
@@ -432,8 +432,8 @@ SECTIONS
   ${RELOCATING+${VECTORS}}
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/elfxtensa.sc b/ld/scripttempl/elfxtensa.sc
index a6cd174ccd0ba78a714c027768e2896af943ae29..7c71525cbebea8e57e03d33697db08e3541c6652 100644 (file)
--- a/ld/scripttempl/elfxtensa.sc
+++ b/ld/scripttempl/elfxtensa.sc
@@ -543,9 +543,8 @@ if test -n "${NON_ALLOC_DYN}"; then
   rm -f ldscripts/dyntmp.$$
 fi
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/epiphany_4x4.sc b/ld/scripttempl/epiphany_4x4.sc
index 42e2f7e761379404f64cd361f188258f3365d354..0f4e74f9e06101354a869fe14be176208c707dc0 100644 (file)
--- a/ld/scripttempl/epiphany_4x4.sc
+++ b/ld/scripttempl/epiphany_4x4.sc
@@ -626,9 +626,8 @@ if test -n "${NON_ALLOC_DYN}"; then
   rm -f ldscripts/dyntmp.$$
 fi
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/ft32.sc b/ld/scripttempl/ft32.sc
index e2d5a6bdfc90e2e64ee7e8f6d4bf5d0d3405983c..e52e75cd924cf98b049195d9e047560b38505745 100644 (file)
--- a/ld/scripttempl/ft32.sc
+++ b/ld/scripttempl/ft32.sc
@@ -60,14 +60,11 @@ SECTIONS
 
   ${RELOCATING+ __data_load_start = LOADADDR(.data); }
   ${RELOCATING+ __data_load_end = __data_load_start + SIZEOF(.data); }
+EOF
 
-  .stab 0 ${RELOCATING+(NOLOAD)} :
-  {
-    *(.stab)
-  }
-  .stabstr 0 ${RELOCATING+(NOLOAD)} :
-  {
-    *(.stabstr)
-  }
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
+
+cat <<EOF
 }
 EOF

diff --git a/ld/scripttempl/i386beos.sc b/ld/scripttempl/i386beos.sc
index 284fcb38a152a4f1a6e2746fd8547802c958a90f..1a2422edc04449d91733613d195bd764d74c315f 100644 (file)
--- a/ld/scripttempl/i386beos.sc
+++ b/ld/scripttempl/i386beos.sc
@@ -174,7 +174,7 @@ SECTIONS
   }
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/i386go32.sc b/ld/scripttempl/i386go32.sc
index 49959af7025a02560fb32d843f863200b6b45388..9459f00492c766f2f02762289b81c5e38c6b6ae2 100644 (file)
--- a/ld/scripttempl/i386go32.sc
+++ b/ld/scripttempl/i386go32.sc
@@ -91,7 +91,7 @@ SECTIONS
   .stabstr 0 : { *(.stabstr) }
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/ia64vms.sc b/ld/scripttempl/ia64vms.sc
index da37c39178f583a3e73864fdd1d6568e09a67e59..4e0f4c09b1225b2ed232ab2f87276f2da76fb414 100644 (file)
--- a/ld/scripttempl/ia64vms.sc
+++ b/ld/scripttempl/ia64vms.sc
@@ -122,7 +122,7 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   .note : { *(.vms.note) }

diff --git a/ld/scripttempl/ip2k.sc b/ld/scripttempl/ip2k.sc
index 89a2f1639e729eed8dc74473d867a9134d94d5ee..0ce66bae4187c68b932ee66fdc335b97b80ea5e9 100644 (file)
--- a/ld/scripttempl/ip2k.sc
+++ b/ld/scripttempl/ip2k.sc
@@ -137,9 +137,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/iq2000.sc b/ld/scripttempl/iq2000.sc
index 44228e7f1a88daa1a4f1627c838fb070a706f232..47bd777327e276659fe8d18edebc4b52e6cbd7f2 100644 (file)
--- a/ld/scripttempl/iq2000.sc
+++ b/ld/scripttempl/iq2000.sc
@@ -408,9 +408,8 @@ cat <<EOF
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${RELOCATING+${OTHER_RELOCATING_SECTIONS}}

diff --git a/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc
index 1a0252d907340255998b53bbeb260668958cb374..6b80c36066b5604b5b9b7eb0420e77f9dc1d78af 100644 (file)
--- a/ld/scripttempl/mep.sc
+++ b/ld/scripttempl/mep.sc
@@ -408,9 +408,8 @@ cat <<EOF
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${STACK_ADDR+${STACK}}

diff --git a/ld/scripttempl/misc-sections.sc b/ld/scripttempl/misc-sections.sc
index 115ef1a557921a984edde85028411c97ebff36ff..6de910a64ade0bbd15045b96c5693f8290dad0dc 100644 (file)
--- a/ld/scripttempl/misc-sections.sc
+++ b/ld/scripttempl/misc-sections.sc
@@ -13,7 +13,7 @@ cat <<EOF
   .stab.index    0 : { *(.stab.index) }
   .stab.indexstr 0 : { *(.stab.indexstr) }
 
-  .comment         : { *(.comment); LINKER_VERSION; }
+  .comment 0 (INFO) : { *(.comment); LINKER_VERSION; }
 
   .gnu.build.attributes : { *(.gnu.build.attributes${RELOCATING+ .gnu.build.attributes.*}) }
 

diff --git a/ld/scripttempl/mmo.sc b/ld/scripttempl/mmo.sc
index 823f25854254672ee284a7cff84aae940619f470..746fb1a062b042a9d16a49ac2371449f35008bc1 100644 (file)
--- a/ld/scripttempl/mmo.sc
+++ b/ld/scripttempl/mmo.sc
@@ -128,7 +128,7 @@ SECTIONS
   .stab.indexstr 0 : { *(.stab.indexstr) }
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   .MMIX.reg_contents :

diff --git a/ld/scripttempl/nds32elf.sc b/ld/scripttempl/nds32elf.sc
index b3acb0167807992ef14501085a0b1ad0f5b35bd6..9645e80c56770444c2a2af9120f499fd007c9de4 100644 (file)
--- a/ld/scripttempl/nds32elf.sc
+++ b/ld/scripttempl/nds32elf.sc
@@ -601,9 +601,8 @@ EOF
 
 test -z "${NON_ALLOC_DYN}" || emit_dyn
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${ATTRS_SECTIONS}

diff --git a/ld/scripttempl/pru.sc b/ld/scripttempl/pru.sc
index a24005b0f669784b3c67ad931d4b4d26e5fa7082..8531cb8d5beb224bba8f3a44b9583017b7b5c945 100644 (file)
--- a/ld/scripttempl/pru.sc
+++ b/ld/scripttempl/pru.sc
@@ -204,9 +204,8 @@ SECTIONS
   .note.gnu.build-id ${RELOCATING-0} : { *(.note.gnu.build-id) }
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/v850.sc b/ld/scripttempl/v850.sc
index 515aeb149a9a023b685120b0b1e3a8a3052e420b..3de6bdd2ef533ff9ef00c53b407475858acc665c 100644 (file)
--- a/ld/scripttempl/v850.sc
+++ b/ld/scripttempl/v850.sc
@@ -198,9 +198,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   /* User stack.  */

diff --git a/ld/scripttempl/v850_rh850.sc b/ld/scripttempl/v850_rh850.sc
index a06889354ad811f5e5cc126d0674d380d34eb418..2c70914c119563e16ba53a7167947669a88787be 100644 (file)
--- a/ld/scripttempl/v850_rh850.sc
+++ b/ld/scripttempl/v850_rh850.sc
@@ -218,9 +218,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   /* User stack.  */

diff --git a/ld/scripttempl/visium.sc b/ld/scripttempl/visium.sc
index def19ca84bbbd9e35fdac6b121740cd69ff2e544..d11dafd7157f522316e3ed50523854ebe7a43f32 100644 (file)
--- a/ld/scripttempl/visium.sc
+++ b/ld/scripttempl/visium.sc
@@ -167,7 +167,7 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/scripttempl/xstormy16.sc b/ld/scripttempl/xstormy16.sc
index 2b3c05196193ed5a78a3dd86ba7b9ea4cd04ea41..ccae0a2e04f7a742edd058f84b336bd3412e0940 100644 (file)
--- a/ld/scripttempl/xstormy16.sc
+++ b/ld/scripttempl/xstormy16.sc
@@ -205,9 +205,8 @@ SECTIONS
 
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
   ${RELOCATING+${OTHER_RELOCATING_SECTIONS}}

diff --git a/ld/scripttempl/z80.sc b/ld/scripttempl/z80.sc
index 75a6a4a797230475aa2ecc3b44524e8cbefe509d..1ea8bee32ac65cc4af8b0b15255405eff520e3e5 100644 (file)
--- a/ld/scripttempl/z80.sc
+++ b/ld/scripttempl/z80.sc
@@ -51,8 +51,8 @@ SECTIONS
        }
 EOF
 
-. $srcdir/scripttempl/misc-sections.sc
-. $srcdir/scripttempl/DWARF.sc
+source_sh $srcdir/scripttempl/misc-sections.sc
+source_sh $srcdir/scripttempl/DWARF.sc
 
 cat <<EOF
 }

diff --git a/ld/testsuite/ld-scripts/ld-version-2.d b/ld/testsuite/ld-scripts/ld-version-2.d
index 761234901ff49f923663ea458eb8e5bf03709b84..c8738fd82d61f4474c5ed681a9875c84b419fbd9 100644 (file)
--- a/ld/testsuite/ld-scripts/ld-version-2.d
+++ b/ld/testsuite/ld-scripts/ld-version-2.d
@@ -2,7 +2,6 @@
 # ld: --enable-linker-version -e 0
 # readelf: -p.comment
 # target: [is_elf_format]
-# skip: ft32-*-* pru-*-*
 
 String dump of section '.comment':
 .*GNU ld \(GNU Binutils\) 2.*