sam/radix-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "linker.ld: Work around portability issue"

Browse source 
This reverts commit 1929fda490.
This commit is contained in:
mintsuki 2022-07-09 20:08:53 +02:00
parent 8d9603b566
commit fe90ab4f39
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel/GNUmakefile
View file

@ -42,7 +42,7 @@ override INTERNALLDFLAGS := \
-nostdlib \ -nostdlib \
-static \ -static \
-Wl,-z,max-page-size=0x1000 \ -Wl,-z,max-page-size=0x1000 \
-Wl,-T,linker-$(ARCH).ld -Wl,-T,linker.ld
# Set archtecture specific variables (and check that the architecture is supported). # Set archtecture specific variables (and check that the architecture is supported).
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
@ -57,7 +57,8 @@ ifeq ($(ARCH),x86_64)
-mno-red-zone \ -mno-red-zone \
-mcmodel=kernel -mcmodel=kernel
override INTERNALLDFLAGS += \ override INTERNALLDFLAGS += \
-Wl,-m,elf_x86_64 -Wl,-m,elf_x86_64 \
-Wl,--oformat=elf64-x86-64
else else
$(error Architecture $(ARCH) not supported) $(error Architecture $(ARCH) not supported)
endif endif

4
kernel/linker-x86_64.ld → kernel/linker.ld
View file

@ -1,7 +1,3 @@
/* Tell the linker that we want an x86_64 ELF64 output file */
OUTPUT_FORMAT(elf64-x86-64)
OUTPUT_ARCH(i386:x86-64)
/* We want the symbol _start to be our entry point */ /* We want the symbol _start to be our entry point */
ENTRY(_start) ENTRY(_start)