From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) by sourceware.org (Postfix) with ESMTPS id 697743858C2D for ; Fri, 19 Jan 2024 20:01:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 697743858C2D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 697743858C2D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:4860:4864:20::2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705694473; cv=none; b=UpxoBinllGiDky1uXcsAnrwyW3kCML9uhv+SYX1awhwcc8NhuUblJ2k+Xknck5YMDASYLesWe3pgkBosZYsf6C01ouLqe07i59HfQwY28rD7M5yWjqc16f45hl0CrdZ/ibhiyFuMlUHSwpjQvwBDOYLd4fWG45EHa4UrWx3rmy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705694473; c=relaxed/simple; bh=tUCswktIsK83UrAr9uiBaWGOwnrRtTQlaqgInvHgik4=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=qwZ+eIK5BWaR4r88PdiLpvqEmPMZyv0m5HKi1BXsWr55p2sau5hZJdpb1EuAF3ex1zzbLgGokak89a0VvMGO4Z2vfzI3b9WRFE5PADBmEcpB/iZdhFcYTemnsbDAXmNYvjGU9xIx2s8iHfOytJGj1I8K7G6KdYmo2I2F6j8WowY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-210ce33ea1aso532331fac.0 for ; Fri, 19 Jan 2024 12:01:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705694468; x=1706299268; darn=sourceware.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=vjE2N6/v/x7a6v+4SCh1SawZkNSE5e2IyJS6fEr6SFw=; b=j4Cr32O84o6RJOC+/7NkLYR07l4N+Qg1wiTD+xLUpdMppB2Xmo5G932TeGvp5dnTZF Go6xakqBVCWJir6YpX/23w0a2lH/07G6tEaFITCQ0nPaxZo4HwfZ6WZGmjBm47nCrq+n 6HkbcVt40n2cmMp7ttq1KG+Sm/VEWIDQUg43ARmIvFcOqWuFWeuJd7CF0s+qJK8q1NEs hWuTKTkTovGdEMAMUh7jAp47LF5TJDV8fWEj+cRSjfjx1Y0dzE6YEk9eKBq+ez/FY9ZM tK859JFmlCbuPahkySq04z1d59KbQv4djbqniK60n59bcFvFE8k7Pg3D1nsqrBgD5Nh2 /8Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705694468; x=1706299268; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vjE2N6/v/x7a6v+4SCh1SawZkNSE5e2IyJS6fEr6SFw=; b=Ec38PADiC6sgXCczmY+j4SkoBhGheYY7IOaUcsuX2MGyZa3yx1icARPKcqmofH9AC1 mzViYvmjpSJ/hOEKb+A+xrydp4JkW32iDR0K7dPcUFONyZMNTAoz06X9HyEjTGFqtjkV Q4h/gnvd7V4p2V9Zhj0YDYODb0szzd5GEsbPl6631EzV4i67HcJQefdMgHFt6kLRG7MV IL7FGlj80Vi6rL8pfmADXfFIrC4/7ugaYBc08W/iPHB8ojm4lhPXiJwUVEvHUib+vBWw eHgRmpa52f9gquvjjzG9kTi+DBxNzg5XHqAYgzyvQrNnhhDV/v6qLBQ4MaOrjhzvBwCz blVQ== X-Gm-Message-State: AOJu0YwlJi2yBeD84oNHU7dRlof+wCcov0Gz+WCeWxvJM1dE6VM4WpbJ zDFYRVU2FQtMaHVry9OYDAq2n5je66FOQJGCCpGLgnMQb2zQkGmWFyyGP9tCIJxvpTlklB77SSy u4oHPASIBHQlEoquRm7FquSUscBA= X-Google-Smtp-Source: AGHT+IENlcPbq5atzsT4+6XjbrpsLOtBG6CpnwsUXCarQh1F5bpHzZn2LKmbCzhYJ5yrKWe2k88SQ8CNMGgkQbhenEA= X-Received: by 2002:a05:6870:6490:b0:203:ec56:f0a2 with SMTP id cz16-20020a056870649000b00203ec56f0a2mr329149oab.44.1705694468365; Fri, 19 Jan 2024 12:01:08 -0800 (PST) MIME-Version: 1.0 References: <20240119194552.1255481-1-hjl.tools@gmail.com> <20240119194552.1255481-3-hjl.tools@gmail.com> In-Reply-To: <20240119194552.1255481-3-hjl.tools@gmail.com> From: Noah Goldstein Date: Fri, 19 Jan 2024 20:00:56 +0000 Message-ID: Subject: Re: [PATCH 2/4] ld: Include the text section order file in all ELF linker scripts To: "H.J. Lu" Cc: binutils@sourceware.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Fri, Jan 19, 2024 at 7:45=E2=80=AFPM H.J. Lu wrote= : > > Include the text section order file in all ELF linker scripts and enable > --text-section-ordering-file tests for all ELF targets. > > * scripttempl/avr.sc: Include the text section order file. > * scripttempl/dlx.sc: Likewise. > * scripttempl/elf32cr16.sc: Likewise. > * scripttempl/elf32crx.sc: Likewise. > * scripttempl/elf32msp430.sc: Likewise. > * scripttempl/elf64bpf.sc: Likewise. > * scripttempl/elf64hppa.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/ft32.sc: Likewise. > * scripttempl/iq2000.sc: Likewise. > * scripttempl/mep.sc: Likewise. > * scripttempl/mmo.sc: Likewise. > * scripttempl/pru.sc: Likewise. > * scripttempl/v850.sc: Likewise. > * scripttempl/v850_rh850.sc: Likewise. > * scripttempl/visium.sc: Likewise. > * scripttempl/xstormy16.sc: Likewise. > * scripttempl/arclinux.sc: Include the text section order file > and place code text sections toward the end. > * scripttempl/elf64bpf.sc: Likewise. > * scripttempl/nds32elf.sc: Likewise. > * testsuite/ld-scripts/text-order-1a.d: Remove xfail. > * testsuite/ld-scripts/text-order-1b.d: Likewise. > * testsuite/ld-scripts/text-order-1c.d: Likewise. > --- > ld/scripttempl/arclinux.sc | 5 +++-- > ld/scripttempl/avr.sc | 1 + > ld/scripttempl/dlx.sc | 1 + > ld/scripttempl/elf32cr16.sc | 1 + > ld/scripttempl/elf32crx.sc | 1 + > ld/scripttempl/elf32msp430.sc | 1 + > ld/scripttempl/elf64bpf.sc | 5 +++-- > ld/scripttempl/elf64hppa.sc | 1 + > ld/scripttempl/elfarc.sc | 1 + > ld/scripttempl/elfarcv2.sc | 1 + > ld/scripttempl/elfd10v.sc | 1 + > ld/scripttempl/elfd30v.sc | 1 + > ld/scripttempl/elfm68hc11.sc | 1 + > ld/scripttempl/elfm68hc12.sc | 1 + > ld/scripttempl/elfm9s12z.sc | 1 + > ld/scripttempl/elfmicroblaze.sc | 1 + > ld/scripttempl/elfxgate.sc | 1 + > ld/scripttempl/elfxtensa.sc | 1 + > ld/scripttempl/ft32.sc | 1 + > ld/scripttempl/iq2000.sc | 1 + > ld/scripttempl/mep.sc | 1 + > ld/scripttempl/mmo.sc | 1 + > ld/scripttempl/nds32elf.sc | 5 +++-- > ld/scripttempl/pru.sc | 1 + > ld/scripttempl/v850.sc | 1 + > ld/scripttempl/v850_rh850.sc | 1 + > ld/scripttempl/visium.sc | 1 + > ld/scripttempl/xstormy16.sc | 1 + > ld/testsuite/ld-scripts/text-order-1a.d | 2 -- > ld/testsuite/ld-scripts/text-order-1b.d | 2 -- > ld/testsuite/ld-scripts/text-order-1c.d | 2 -- > 31 files changed, 34 insertions(+), 12 deletions(-) > > diff --git a/ld/scripttempl/arclinux.sc b/ld/scripttempl/arclinux.sc > index 36ba5a664d3..646dc08a9f8 100644 > --- a/ld/scripttempl/arclinux.sc > +++ b/ld/scripttempl/arclinux.sc > @@ -487,11 +487,12 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} Why after start symbols? It seems that just decreases the ability to control alignment. > - ${RELOCATING+*(.text.unlikely .text.*_unlikely .text.unlikely.*)} > - ${RELOCATING+*(.text.exit .text.exit.*)} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > ${RELOCATING+*(.text.startup .text.startup.*)} > ${RELOCATING+*(.text.hot .text.hot.*)} > ${RELOCATING+*(SORT(.text.sorted.*))} > + ${RELOCATING+*(.text.unlikely .text.*_unlikely .text.unlikely.*)} > + ${RELOCATING+*(.text.exit .text.exit.*)} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/avr.sc b/ld/scripttempl/avr.sc > index 3b18897f33c..558b4e22c75 100644 > --- a/ld/scripttempl/avr.sc > +++ b/ld/scripttempl/avr.sc > @@ -244,6 +244,7 @@ SECTIONS > KEEP (*(.init8)) > *(.init9) /* Call main(). */ > KEEP (*(.init9))} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+. =3D ALIGN(2); > *(.text.*) > diff --git a/ld/scripttempl/dlx.sc b/ld/scripttempl/dlx.sc > index 8dcbf300c56..e66c68f064d 100644 > --- a/ld/scripttempl/dlx.sc > +++ b/ld/scripttempl/dlx.sc > @@ -22,6 +22,7 @@ SECTIONS > .text : > { > ${RELOCATING+CREATE_OBJECT_SYMBOLS} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+etext =3D ${DATA_ALIGNMENT};} > } > diff --git a/ld/scripttempl/elf32cr16.sc b/ld/scripttempl/elf32cr16.sc > index 3e7d92a4f34..2d6cd971bc2 100644 > --- a/ld/scripttempl/elf32cr16.sc > +++ b/ld/scripttempl/elf32cr16.sc > @@ -81,6 +81,7 @@ SECTIONS > .text : > { > __TEXT_START =3D .; > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) *(.text.*) *(.gnu.linkonce.t.*) > __TEXT_END =3D .; > }${RELOCATING+ > rom} > diff --git a/ld/scripttempl/elf32crx.sc b/ld/scripttempl/elf32crx.sc > index 1b1316676a7..1eb5e752c3a 100644 > --- a/ld/scripttempl/elf32crx.sc > +++ b/ld/scripttempl/elf32crx.sc > @@ -77,6 +77,7 @@ SECTIONS > .text : > { > __TEXT_START =3D .; > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) *(.text.*) *(.gnu.linkonce.t.*) > __TEXT_END =3D .; > } > rom > diff --git a/ld/scripttempl/elf32msp430.sc b/ld/scripttempl/elf32msp430.s= c > index bed0d673238..1fadaca2e27 100644 > --- a/ld/scripttempl/elf32msp430.sc > +++ b/ld/scripttempl/elf32msp430.sc > @@ -163,6 +163,7 @@ SECTIONS > *(.lower.text.* .lower.text) > > . =3D ALIGN(2);} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+. =3D ALIGN(2); > *(.text.*) > diff --git a/ld/scripttempl/elf64bpf.sc b/ld/scripttempl/elf64bpf.sc > index ca62d7c88e0..93d8592a6a6 100644 > --- a/ld/scripttempl/elf64bpf.sc > +++ b/ld/scripttempl/elf64bpf.sc > @@ -508,11 +508,12 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > - ${RELOCATING+*(.text.unlikely .text.*_unlikely .text.unlikely.*)} > - ${RELOCATING+*(.text.exit .text.exit.*)} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > ${RELOCATING+*(.text.startup .text.startup.*)} > ${RELOCATING+*(.text.hot .text.hot.*)} > ${RELOCATING+*(SORT(.text.sorted.*))} > + ${RELOCATING+*(.text.unlikely .text.*_unlikely .text.unlikely.*)} > + ${RELOCATING+*(.text.exit .text.exit.*)} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/elf64hppa.sc b/ld/scripttempl/elf64hppa.sc > index 6bde304dd27..94b458010c5 100644 > --- a/ld/scripttempl/elf64hppa.sc > +++ b/ld/scripttempl/elf64hppa.sc > @@ -412,6 +412,7 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/elfarc.sc b/ld/scripttempl/elfarc.sc > index 1ae0248a900..ec16bf5a184 100644 > --- a/ld/scripttempl/elfarc.sc > +++ b/ld/scripttempl/elfarc.sc > @@ -288,6 +288,7 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/elfarcv2.sc b/ld/scripttempl/elfarcv2.sc > index 3054e4c62f3..30bcbd304ab 100644 > --- a/ld/scripttempl/elfarcv2.sc > +++ b/ld/scripttempl/elfarcv2.sc > @@ -192,6 +192,7 @@ SECTIONS > > /* Remaining code. */ > ${RELOCATING+ . =3D ALIGN(4);} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/elfd10v.sc b/ld/scripttempl/elfd10v.sc > index 1ecf4a19092..e42bf3cfa70 100644 > --- a/ld/scripttempl/elfd10v.sc > +++ b/ld/scripttempl/elfd10v.sc > @@ -109,6 +109,7 @@ SECTIONS > KEEP (*(SORT_NONE(.init.*))) > KEEP (*(SORT_NONE(.fini))) > KEEP (*(SORT_NONE(.fini.*)))} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > /* .gnu.warning sections are handled specially by elf.em. */ > diff --git a/ld/scripttempl/elfd30v.sc b/ld/scripttempl/elfd30v.sc > index ed0c412edc8..2dcbb7522cc 100644 > --- a/ld/scripttempl/elfd30v.sc > +++ b/ld/scripttempl/elfd30v.sc > @@ -125,6 +125,7 @@ SECTIONS > /* Internal text space or external memory */ > .text : > { > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.gnu.linkonce.t*) > KEEP (*(SORT_NONE(.fini))) > diff --git a/ld/scripttempl/elfm68hc11.sc b/ld/scripttempl/elfm68hc11.sc > index b122da0e32a..f4393a87b68 100644 > --- a/ld/scripttempl/elfm68hc11.sc > +++ b/ld/scripttempl/elfm68hc11.sc > @@ -318,6 +318,7 @@ SECTIONS > /* Put startup code at beginning so that _start keeps same address. = */ > ${RELOCATING+${STARTUP_CODE}} > > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > /* .gnu.warning sections are handled specially by elf.em. */ > diff --git a/ld/scripttempl/elfm68hc12.sc b/ld/scripttempl/elfm68hc12.sc > index 47410a95f46..24ea7ed0302 100644 > --- a/ld/scripttempl/elfm68hc12.sc > +++ b/ld/scripttempl/elfm68hc12.sc > @@ -317,6 +317,7 @@ SECTIONS > /* Put startup code at beginning so that _start keeps same address. = */ > ${RELOCATING+${STARTUP_CODE}} > > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > /* .gnu.warning sections are handled specially by elf.em. */ > diff --git a/ld/scripttempl/elfm9s12z.sc b/ld/scripttempl/elfm9s12z.sc > index 271d218835b..2d929e1e3fe 100644 > --- a/ld/scripttempl/elfm9s12z.sc > +++ b/ld/scripttempl/elfm9s12z.sc > @@ -303,6 +303,7 @@ SECTIONS > /* Put startup code at beginning so that _start keeps same address. = */ > ${RELOCATING+${STARTUP_CODE}} > > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > /* .gnu.warning sections are handled specially by elf.em. */ > diff --git a/ld/scripttempl/elfmicroblaze.sc b/ld/scripttempl/elfmicrobla= ze.sc > index 88abe4f10ba..e386da51512 100644 > --- a/ld/scripttempl/elfmicroblaze.sc > +++ b/ld/scripttempl/elfmicroblaze.sc > @@ -79,6 +79,7 @@ SECTIONS > > ${RELOCATING+ _ftext =3D .;} > .text : { > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > ${RELOCATING+*(.gnu.linkonce.t.*)} > diff --git a/ld/scripttempl/elfxgate.sc b/ld/scripttempl/elfxgate.sc > index 4c25bc161f2..71d4855f47e 100644 > --- a/ld/scripttempl/elfxgate.sc > +++ b/ld/scripttempl/elfxgate.sc > @@ -317,6 +317,7 @@ SECTIONS > /* Put startup code at beginning so that _start keeps same address. = */ > ${RELOCATING+${STARTUP_CODE}} > > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > /* .gnu.warning sections are handled specially by elf.em. */ > diff --git a/ld/scripttempl/elfxtensa.sc b/ld/scripttempl/elfxtensa.sc > index 231f53b5f5b..abc1d33350e 100644 > --- a/ld/scripttempl/elfxtensa.sc > +++ b/ld/scripttempl/elfxtensa.sc > @@ -418,6 +418,7 @@ cat < ${RELOCATING+${INIT_END}} > > ${RELOCATING+${TEXT_START_SYMBOLS}} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.literal .text .stub${RELOCATING+ .literal.* .text.* .gnu.linkonce= .literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/ft32.sc b/ld/scripttempl/ft32.sc > index e52e75cd924..8c966de3bb1 100644 > --- a/ld/scripttempl/ft32.sc > +++ b/ld/scripttempl/ft32.sc > @@ -32,6 +32,7 @@ SECTIONS > { > .text : > { > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text${RELOCATING+*}) > ${RELOCATING+*(.strings) > *(._pm*) > diff --git a/ld/scripttempl/iq2000.sc b/ld/scripttempl/iq2000.sc > index e85aa2303ed..94e834aef15 100644 > --- a/ld/scripttempl/iq2000.sc > +++ b/ld/scripttempl/iq2000.sc > @@ -297,6 +297,7 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > *(.stub) > diff --git a/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc > index 39e4d64857c..656b1f64386 100644 > --- a/ld/scripttempl/mep.sc > +++ b/ld/scripttempl/mep.sc > @@ -310,6 +310,7 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/mmo.sc b/ld/scripttempl/mmo.sc > index e87a758eb90..ac6a57eee2a 100644 > --- a/ld/scripttempl/mmo.sc > +++ b/ld/scripttempl/mmo.sc > @@ -30,6 +30,7 @@ SECTIONS > ${RELOCATING+ KEEP (*(SORT_NONE(.init)))} > ${RELOCATING+ PROVIDE (_init_end =3D .);} > > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > ${RELOCATING+*(.gnu.linkonce.t*)} > diff --git a/ld/scripttempl/nds32elf.sc b/ld/scripttempl/nds32elf.sc > index 0f8366d91ac..2626e773a4e 100644 > --- a/ld/scripttempl/nds32elf.sc > +++ b/ld/scripttempl/nds32elf.sc > @@ -434,11 +434,12 @@ cat < .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > - ${RELOCATING+*(.text.unlikely .text.*_unlikely .text.unlikely.*)} > - ${RELOCATING+*(.text.exit .text.exit.*)} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > ${RELOCATING+*(.text.startup .text.startup.*)} > ${RELOCATING+*(.text.hot .text.hot.*)} > ${RELOCATING+*(SORT(.text.sorted.*))} > + ${RELOCATING+*(.text.unlikely .text.*_unlikely .text.unlikely.*)} > + ${RELOCATING+*(.text.exit .text.exit.*)} > *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) > /* .gnu.warning sections are handled specially by elf.em. */ > *(.gnu.warning) > diff --git a/ld/scripttempl/pru.sc b/ld/scripttempl/pru.sc > index 3ff86bc61c7..d4d79cbcf82 100644 > --- a/ld/scripttempl/pru.sc > +++ b/ld/scripttempl/pru.sc > @@ -110,6 +110,7 @@ SECTIONS > ${RELOCATING+KEEP (*(.init0))} > > ${RELOCATING+. =3D ALIGN(4);} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+. =3D ALIGN(4);} > ${RELOCATING+*(.text.*)} > diff --git a/ld/scripttempl/v850.sc b/ld/scripttempl/v850.sc > index 10d1da8b5bb..530b4ee72ca 100644 > --- a/ld/scripttempl/v850.sc > +++ b/ld/scripttempl/v850.sc > @@ -76,6 +76,7 @@ SECTIONS > > .text : > { > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > > diff --git a/ld/scripttempl/v850_rh850.sc b/ld/scripttempl/v850_rh850.sc > index e63e7db8884..3d2874267a9 100644 > --- a/ld/scripttempl/v850_rh850.sc > +++ b/ld/scripttempl/v850_rh850.sc > @@ -80,6 +80,7 @@ SECTIONS > > .text : > { > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > > diff --git a/ld/scripttempl/visium.sc b/ld/scripttempl/visium.sc > index 0b90b888136..8d97bbf4a68 100644 > --- a/ld/scripttempl/visium.sc > +++ b/ld/scripttempl/visium.sc > @@ -67,6 +67,7 @@ SECTIONS > > .text ${RELOCATING-0} : { > ${RELOCATING+ _ftext =3D .;} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > ${RELOCATING+*(.gnu.linkonce.t.*)} > diff --git a/ld/scripttempl/xstormy16.sc b/ld/scripttempl/xstormy16.sc > index c4117fcde3e..3de1bfa0d18 100644 > --- a/ld/scripttempl/xstormy16.sc > +++ b/ld/scripttempl/xstormy16.sc > @@ -179,6 +179,7 @@ SECTIONS > .text ${RELOCATING-0} : > { > ${RELOCATING+${TEXT_START_SYMBOLS}} > + ${RELOCATING+INCLUDE config.text_section_ordering_file} > *(.text) > ${RELOCATING+*(.text.*)} > *(.stub) > diff --git a/ld/testsuite/ld-scripts/text-order-1a.d b/ld/testsuite/ld-sc= ripts/text-order-1a.d > index 87cee75055f..d6f976f42ad 100644 > --- a/ld/testsuite/ld-scripts/text-order-1a.d > +++ b/ld/testsuite/ld-scripts/text-order-1a.d > @@ -4,8 +4,6 @@ > #ld: --text-section-ordering-file text-order-1a.t > #nm: -n > #target: [is_elf_format] > -#xfail: [is_generic] hppa64-*-* mep-*-* mn10200-*-* > -# generic linker targets don't support --text-section-ordering-file > > #... > [0-9a-f]+ T yyy > diff --git a/ld/testsuite/ld-scripts/text-order-1b.d b/ld/testsuite/ld-sc= ripts/text-order-1b.d > index 3f83813da2b..3d6f4fd8d66 100644 > --- a/ld/testsuite/ld-scripts/text-order-1b.d > +++ b/ld/testsuite/ld-scripts/text-order-1b.d > @@ -4,8 +4,6 @@ > #ld: --text-section-ordering-file text-order-1b.t > #nm: -n > #target: [is_elf_format] > -#xfail: [is_generic] hppa64-*-* mep-*-* mn10200-*-* > -# generic linker targets don't support --text-section-ordering-file > > #... > [0-9a-f]+ T yyy > diff --git a/ld/testsuite/ld-scripts/text-order-1c.d b/ld/testsuite/ld-sc= ripts/text-order-1c.d > index 0c484637784..4166d634606 100644 > --- a/ld/testsuite/ld-scripts/text-order-1c.d > +++ b/ld/testsuite/ld-scripts/text-order-1c.d > @@ -4,6 +4,4 @@ > #ld: --text-section-ordering-file text-order-1c.t > #nm: -n > #target: [is_elf_format] > -#xfail: [is_generic] hppa64-*-* mep-*-* mn10200-*-* > -# generic linker targets don't support --text-section-ordering-file > #error: .*: nested include 'text-order-1b.t' in the text section orderin= g file: 'text-order-1c.t' > -- > 2.43.0 >