diff --git a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64
index 3d2e4e596636..aa02808b2f84 100644
--- a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64
+++ b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64
@@ -22,9 +22,10 @@ SECTIONS
   . = ALIGN(4096);
   .data :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.set.*)
+    *(.rodata*)
+    __start_set_Xcommand_set = .;
+    *(set_Xcommand_set)
+    __stop_set_Xcommand_set = .;
     *(.ctors)
     *(.data)
     *(.data1)
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index 9e6200f1d373..61848dfc0e3a 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -54,7 +54,6 @@ vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 
 ${BASE}.efi: ${BASE}.sym
 	${OBJCOPY} -j .text \
-		-j set_Xcommand_set \
 		-j .hash \
 		-j .data \
 		-j .sdata \
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 9e6200f1d373..61848dfc0e3a 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -54,7 +54,6 @@ vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 
 ${BASE}.efi: ${BASE}.sym
 	${OBJCOPY} -j .text \
-		-j set_Xcommand_set \
 		-j .hash \
 		-j .data \
 		-j .sdata \
diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64
index 3d2e4e596636..aa02808b2f84 100644
--- a/sys/boot/ia64/efi/ldscript.ia64
+++ b/sys/boot/ia64/efi/ldscript.ia64
@@ -22,9 +22,10 @@ SECTIONS
   . = ALIGN(4096);
   .data :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.set.*)
+    *(.rodata*)
+    __start_set_Xcommand_set = .;
+    *(set_Xcommand_set)
+    __stop_set_Xcommand_set = .;
     *(.ctors)
     *(.data)
     *(.data1)