[COMMIT osv master] makefile: remove redundant linker script for vmlinuz.bin which causes gcc 9.2 linker error

4 views
Skip to first unread message

Commit Bot

unread,
Nov 27, 2019, 1:46:13 PM11/27/19
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

makefile: remove redundant linker script for vmlinuz.bin which causes gcc
9.2 linker error

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -447,7 +447,7 @@ $(out)/arch/x64/vmlinuz-boot32.o:
$(out)/loader-stripped.elf
$(out)/arch/x64/vmlinuz-boot32.o: ASFLAGS += -I$(out)
-DOSV_KERNEL_SIZE=$(kernel_size)

$(out)/vmlinuz-boot.bin: $(out)/arch/x64/vmlinuz-boot32.o
arch/x64/vmlinuz-boot.ld
- $(call quiet, $(LD) -nostartfiles -static -nodefaultlibs -T
arch/x64/vmlinuz-boot.ld -o $@ \
+ $(call quiet, $(LD) -nostartfiles -static -nodefaultlibs -o $@ \
$(filter-out %.bin, $(^:%.ld=-T %.ld)), LD $@)

$(out)/vmlinuz.bin: $(out)/vmlinuz-boot.bin $(out)/loader-stripped.elf
Reply all
Reply to author
Forward
0 new messages