diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-23 22:27:12 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-28 03:04:41 -0600 |
| commit | b5e824a5a2da5aa179f03183ac501a154346348d (patch) | |
| tree | 150d6e7cfea84ca5f6f422c2af017835848d34b2 | |
| parent | feb89cab65c6ab1a6cbeeaaeb11b1a174772cea8 (diff) | |
qemu: mark per_cpu_load_addr as static for gcc-10
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | src/tests/qemu/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile index e894be2..75d0368 100644 --- a/src/tests/qemu/Makefile +++ b/src/tests/qemu/Makefile @@ -275,6 +275,7 @@ $(KERNEL_PATH)/.installed: $(KERNEL_TAR) sed -i "/printf '\\\\#/d" $(KERNEL_PATH)/tools/build/Build.include || true sed -i '/jmp early_idt_handler$$/a .fill early_idt_handlers + i*9 - ., 1, 0xcc' $(KERNEL_PATH)/arch/x86/kernel/head_{64,32}.S || true printf 'ifdef CONFIG_X86_64\nLDFLAGS += $$(call ld-option, -z max-page-size=0x200000)\nendif\n' >> $(KERNEL_PATH)/arch/x86/Makefile + sed -i 's/^Elf_Addr per_cpu_load_addr;$$/static \0/' $(KERNEL_PATH)/arch/x86/tools/relocs.c || true sed -i 's/pages = generic_max_swapfile_size();/pages = IS_ENABLED(CONFIG_SWAP) ? generic_max_swapfile_size() : 0;/' $(KERNEL_PATH)/arch/x86/mm/init.c || true if grep -qr UTS_UBUNTU_RELEASE_ABI $(KERNEL_PATH)/debian/rules.d; then echo 'KBUILD_CFLAGS += -DUTS_UBUNTU_RELEASE_ABI=0' >> $(KERNEL_PATH)/Makefile; fi sed -i "/^if INET\$$/a source \"net/wireguard/Kconfig\"" $(KERNEL_PATH)/net/Kconfig |