diff --git a/common/GNUmakefile b/common/GNUmakefile
index 893f3d90..1430d0ce 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -227,7 +227,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_stage2only.ld: linker_bios.ld.in
 	mkdir -p '$(call SHESCAPE,$(BUILDDIR))'
 	$(CROSS_CC) -x c -E -P -undef -DLINKER_STAGE2ONLY linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
 
-$(call MKESCAPE,$(BUILDDIR))/limine_stage2only.elf: $(OBJ) ../libgcc-binaries/libgcc-i686.a
+$(call MKESCAPE,$(BUILDDIR))/limine_stage2only.elf: $(OBJ) ../libgcc-binaries/libgcc-i686.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o
 	$(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
 	$(CROSS_LD) '$(call OBJESCAPE,$^)' $(CROSS_LDFLAGS) $(INTERNAL_LDFLAGS) -T'$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld' -o '$(call SHESCAPE,$@)' || \
 		( echo "This error may mean that stage 2 was trying to use stage 3 symbols before loading stage 3" && \
diff --git a/common/linker_bios.ld.in b/common/linker_bios.ld.in
index e9bbdc6a..1e33c243 100644
--- a/common/linker_bios.ld.in
+++ b/common/linker_bios.ld.in
@@ -86,53 +86,7 @@ SECTIONS
         data_end = .;
     } :data_s3
 
-    /* DWARF section definitions from GNU binutils */
-    /* Copyright (C) 2014-2022 Free Software Foundation, Inc.
-       Copying and distribution of this script, with or without modification,
-       are permitted in any medium without royalty provided the copyright
-       notice and this notice are preserved.  */
-
-    /* DWARF debug sections.
-       Symbols in the DWARF debugging sections are relative to the beginning
-       of the section so we begin them at 0.  */
-    /* DWARF 1.  */
-    .debug          0 : { *(.debug) }
-    .line           0 : { *(.line) }
-    /* GNU DWARF 1 extensions.  */
-    .debug_srcinfo  0 : { *(.debug_srcinfo) }
-    .debug_sfnames  0 : { *(.debug_sfnames) }
-    /* DWARF 1.1 and DWARF 2.  */
-    .debug_aranges  0 : { *(.debug_aranges) }
-    .debug_pubnames 0 : { *(.debug_pubnames) }
-    /* DWARF 2.  */
-    .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-    .debug_abbrev   0 : { *(.debug_abbrev) }
-    .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
-    .debug_frame    0 : { *(.debug_frame) }
-    .debug_str      0 : { *(.debug_str) }
-    .debug_loc      0 : { *(.debug_loc) }
-    .debug_macinfo  0 : { *(.debug_macinfo) }
-    /* SGI/MIPS DWARF 2 extensions.  */
-    .debug_weaknames 0 : { *(.debug_weaknames) }
-    .debug_funcnames 0 : { *(.debug_funcnames) }
-    .debug_typenames 0 : { *(.debug_typenames) }
-    .debug_varnames  0 : { *(.debug_varnames) }
-    /* DWARF 3.  */
-    .debug_pubtypes 0 : { *(.debug_pubtypes) }
-    .debug_ranges   0 : { *(.debug_ranges) }
-    /* DWARF 5.  */
-    .debug_addr     0 : { *(.debug_addr) }
-    .debug_line_str 0 : { *(.debug_line_str) }
-    .debug_loclists 0 : { *(.debug_loclists) }
-    .debug_macro    0 : { *(.debug_macro) }
-    .debug_names    0 : { *(.debug_names) }
-    .debug_rnglists 0 : { *(.debug_rnglists) }
-    .debug_str_offsets 0 : { *(.debug_str_offsets) }
-    .debug_sup      0 : { *(.debug_sup) }
-    .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-
     /DISCARD/ : {
-        *.a:*(*)
-        *.o(*)
+        *(.note .note.*)
     }
 }
diff --git a/common/linker_uefi_ia32.ld.in b/common/linker_uefi_ia32.ld.in
index 512c3ab7..f5cb241a 100644
--- a/common/linker_uefi_ia32.ld.in
+++ b/common/linker_uefi_ia32.ld.in
@@ -84,53 +84,7 @@ SECTIONS
 
     __image_end = __data_end;
 
-    /* DWARF section definitions from GNU binutils */
-    /* Copyright (C) 2014-2022 Free Software Foundation, Inc.
-       Copying and distribution of this script, with or without modification,
-       are permitted in any medium without royalty provided the copyright
-       notice and this notice are preserved.  */
-
-    /* DWARF debug sections.
-       Symbols in the DWARF debugging sections are relative to the beginning
-       of the section so we begin them at 0.  */
-    /* DWARF 1.  */
-    .debug          0 : { *(.debug) }
-    .line           0 : { *(.line) }
-    /* GNU DWARF 1 extensions.  */
-    .debug_srcinfo  0 : { *(.debug_srcinfo) }
-    .debug_sfnames  0 : { *(.debug_sfnames) }
-    /* DWARF 1.1 and DWARF 2.  */
-    .debug_aranges  0 : { *(.debug_aranges) }
-    .debug_pubnames 0 : { *(.debug_pubnames) }
-    /* DWARF 2.  */
-    .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-    .debug_abbrev   0 : { *(.debug_abbrev) }
-    .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
-    .debug_frame    0 : { *(.debug_frame) }
-    .debug_str      0 : { *(.debug_str) }
-    .debug_loc      0 : { *(.debug_loc) }
-    .debug_macinfo  0 : { *(.debug_macinfo) }
-    /* SGI/MIPS DWARF 2 extensions.  */
-    .debug_weaknames 0 : { *(.debug_weaknames) }
-    .debug_funcnames 0 : { *(.debug_funcnames) }
-    .debug_typenames 0 : { *(.debug_typenames) }
-    .debug_varnames  0 : { *(.debug_varnames) }
-    /* DWARF 3.  */
-    .debug_pubtypes 0 : { *(.debug_pubtypes) }
-    .debug_ranges   0 : { *(.debug_ranges) }
-    /* DWARF 5.  */
-    .debug_addr     0 : { *(.debug_addr) }
-    .debug_line_str 0 : { *(.debug_line_str) }
-    .debug_loclists 0 : { *(.debug_loclists) }
-    .debug_macro    0 : { *(.debug_macro) }
-    .debug_names    0 : { *(.debug_names) }
-    .debug_rnglists 0 : { *(.debug_rnglists) }
-    .debug_str_offsets 0 : { *(.debug_str_offsets) }
-    .debug_sup      0 : { *(.debug_sup) }
-    .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-
     /DISCARD/ : {
-        *.a:*(*)
-        *.o(*)
+        *(.note .note.*)
     }
 }
diff --git a/common/linker_uefi_x86_64.ld.in b/common/linker_uefi_x86_64.ld.in
index 287ab756..dbe0b190 100644
--- a/common/linker_uefi_x86_64.ld.in
+++ b/common/linker_uefi_x86_64.ld.in
@@ -84,53 +84,7 @@ SECTIONS
 
     __image_end = __data_end;
 
-    /* DWARF section definitions from GNU binutils */
-    /* Copyright (C) 2014-2022 Free Software Foundation, Inc.
-       Copying and distribution of this script, with or without modification,
-       are permitted in any medium without royalty provided the copyright
-       notice and this notice are preserved.  */
-
-    /* DWARF debug sections.
-       Symbols in the DWARF debugging sections are relative to the beginning
-       of the section so we begin them at 0.  */
-    /* DWARF 1.  */
-    .debug          0 : { *(.debug) }
-    .line           0 : { *(.line) }
-    /* GNU DWARF 1 extensions.  */
-    .debug_srcinfo  0 : { *(.debug_srcinfo) }
-    .debug_sfnames  0 : { *(.debug_sfnames) }
-    /* DWARF 1.1 and DWARF 2.  */
-    .debug_aranges  0 : { *(.debug_aranges) }
-    .debug_pubnames 0 : { *(.debug_pubnames) }
-    /* DWARF 2.  */
-    .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-    .debug_abbrev   0 : { *(.debug_abbrev) }
-    .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
-    .debug_frame    0 : { *(.debug_frame) }
-    .debug_str      0 : { *(.debug_str) }
-    .debug_loc      0 : { *(.debug_loc) }
-    .debug_macinfo  0 : { *(.debug_macinfo) }
-    /* SGI/MIPS DWARF 2 extensions.  */
-    .debug_weaknames 0 : { *(.debug_weaknames) }
-    .debug_funcnames 0 : { *(.debug_funcnames) }
-    .debug_typenames 0 : { *(.debug_typenames) }
-    .debug_varnames  0 : { *(.debug_varnames) }
-    /* DWARF 3.  */
-    .debug_pubtypes 0 : { *(.debug_pubtypes) }
-    .debug_ranges   0 : { *(.debug_ranges) }
-    /* DWARF 5.  */
-    .debug_addr     0 : { *(.debug_addr) }
-    .debug_line_str 0 : { *(.debug_line_str) }
-    .debug_loclists 0 : { *(.debug_loclists) }
-    .debug_macro    0 : { *(.debug_macro) }
-    .debug_names    0 : { *(.debug_names) }
-    .debug_rnglists 0 : { *(.debug_rnglists) }
-    .debug_str_offsets 0 : { *(.debug_str_offsets) }
-    .debug_sup      0 : { *(.debug_sup) }
-    .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-
     /DISCARD/ : {
-        *.a:*(*)
-        *.o(*)
+        *(.note .note.*)
     }
 }