build: Update linker scripts and fix minor makefile issue

This commit is contained in:
mintsuki 2022-07-18 20:41:39 +02:00
parent 7e81f5a852
commit 065b37ca93
4 changed files with 4 additions and 7 deletions

View File

@ -228,7 +228,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" && \

View File

@ -87,7 +87,6 @@ SECTIONS
} :data_s3
/DISCARD/ : {
*.a:*(*)
*.o(*)
*(.note .note.*)
}
}

View File

@ -85,7 +85,6 @@ SECTIONS
__image_end = __data_end;
/DISCARD/ : {
*.a:*(*)
*.o(*)
*(.note .note.*)
}
}

View File

@ -85,7 +85,6 @@ SECTIONS
__image_end = __data_end;
/DISCARD/ : {
*.a:*(*)
*.o(*)
*(.note .note.*)
}
}