From d024bc7ff5e80537438b4556810782e9a8257b44 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 24 Feb 2024 17:57:04 -0700
Subject: [PATCH] loader/efi: Linker sets not needed.

We don't need linker sets listed as sections. They are explicitly
included in the objcopy we use to create the .efi file. This practice
was added in 2002 by peter@ in a6d81d83a280 to make ia64 builds
self-hosted. However, it was added back to the objcopy in 2010 by rpaulo
in 8df7a05edd36 for i386 EFI support, though the ldscript file then
retained them needlessly. The gcc/binutils bug having been fixed in the
interim. We've not needed them since then, but the redundancy didn't
matter.

Sponsored by:		Netflix
Reviewed by:		tsoome, kevans
Differential Revision:	https://reviews.freebsd.org/D44061
---
 stand/efi/loader/arch/amd64/amd64.ldscript | 11 -----------
 stand/efi/loader/arch/arm/arm.ldscript     | 10 ----------
 stand/efi/loader/arch/arm64/arm64.ldscript | 11 -----------
 stand/efi/loader/arch/riscv/riscv.ldscript | 11 -----------
 4 files changed, 43 deletions(-)

diff --git a/stand/efi/loader/arch/amd64/amd64.ldscript b/stand/efi/loader/arch/amd64/amd64.ldscript
index 57014aefc025..0e620654ea81 100644
--- a/stand/efi/loader/arch/amd64/amd64.ldscript
+++ b/stand/efi/loader/arch/amd64/amd64.ldscript
@@ -34,17 +34,6 @@ SECTIONS
     *(COMMON)
   }
   . = ALIGN(4096);
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
-  . = ALIGN(4096);
   __gp = .;
   .sdata	: {
     *(.got.plt .got)
diff --git a/stand/efi/loader/arch/arm/arm.ldscript b/stand/efi/loader/arch/arm/arm.ldscript
index 13affe12bbba..7b5c2af399c9 100644
--- a/stand/efi/loader/arch/arm/arm.ldscript
+++ b/stand/efi/loader/arch/arm/arm.ldscript
@@ -42,16 +42,6 @@ SECTIONS
     *(.got.plt .got)
     *(.sdata*.sdata.* .gnu.linkonce.s.*)
   }
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
   __gp = .;
   .plt   : { *(.plt) }
   .reloc	: { *(.reloc) }
diff --git a/stand/efi/loader/arch/arm64/arm64.ldscript b/stand/efi/loader/arch/arm64/arm64.ldscript
index bacb81b5032f..18aead05cb49 100644
--- a/stand/efi/loader/arch/arm64/arm64.ldscript
+++ b/stand/efi/loader/arch/arm64/arm64.ldscript
@@ -39,17 +39,6 @@ SECTIONS
     __bss_end = .;
   }
   . = ALIGN(16);
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
-  . = ALIGN(16);
   __gp = .;
   .sdata	: {
     *(.got.plt .got)
diff --git a/stand/efi/loader/arch/riscv/riscv.ldscript b/stand/efi/loader/arch/riscv/riscv.ldscript
index 342ec62cf03e..63b71c3bd702 100644
--- a/stand/efi/loader/arch/riscv/riscv.ldscript
+++ b/stand/efi/loader/arch/riscv/riscv.ldscript
@@ -35,17 +35,6 @@ SECTIONS
     __bss_end = .;
   }
   . = ALIGN(16);
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
-  . = ALIGN(16);
   .sdata	: {
     /*
      * u-boot expects the gp register to be untouched by the EFI payload, so we