diff --git a/stage23/linker_uefi.ld b/stage23/linker_uefi.ld
index 45e981d2..3035ec20 100644
--- a/stage23/linker_uefi.ld
+++ b/stage23/linker_uefi.ld
@@ -38,7 +38,8 @@ SECTIONS
    *(.rodata*)
    *(.got.plt)
    *(.got)
-   *(.no_unwind*)
+   *(.full_map)
+   *(.no_unwind)
    data_begin = .;
    *(.data*)
    *(.sdata)
@@ -51,7 +52,6 @@ SECTIONS
    *(COMMON)
    data_end = .;
    *(.rel.local)
-   *(.full_map*)
   }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
 
diff --git a/stage23/linker_uefi32.ld b/stage23/linker_uefi32.ld
index 08a26ea3..c0a6f88d 100644
--- a/stage23/linker_uefi32.ld
+++ b/stage23/linker_uefi32.ld
@@ -38,7 +38,8 @@ SECTIONS
    *(.rodata*)
    *(.got.plt)
    *(.got)
-   *(.no_unwind*)
+   *(.full_map)
+   *(.no_unwind)
    data_begin = .;
    *(.data)
    *(.data1)
@@ -52,7 +53,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
    data_end = .;
-   *(.full_map*)
   }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
 
diff --git a/stage23/linker_uefi32_nomap.ld b/stage23/linker_uefi32_nomap.ld
index 302f9f10..4e7e6fed 100644
--- a/stage23/linker_uefi32_nomap.ld
+++ b/stage23/linker_uefi32_nomap.ld
@@ -38,7 +38,8 @@ SECTIONS
    *(.rodata*)
    *(.got.plt)
    *(.got)
-   *(.no_unwind*)
+   full_map = .;
+   *(.no_unwind)
    data_begin = .;
    *(.data)
    *(.data1)
@@ -52,7 +53,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
    data_end = .;
-   full_map = .;
   }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
 
diff --git a/stage23/linker_uefi_nomap.ld b/stage23/linker_uefi_nomap.ld
index 2caa6d1b..3b9fce5c 100644
--- a/stage23/linker_uefi_nomap.ld
+++ b/stage23/linker_uefi_nomap.ld
@@ -38,7 +38,8 @@ SECTIONS
    *(.rodata*)
    *(.got.plt)
    *(.got)
-   *(.no_unwind*)
+   full_map = .;
+   *(.no_unwind)
    data_begin = .;
    *(.data*)
    *(.sdata)
@@ -51,7 +52,6 @@ SECTIONS
    *(COMMON)
    data_end = .;
    *(.rel.local)
-   full_map = .;
   }
   .note.gnu.build-id : { *(.note.gnu.build-id) }