tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

um: fix linker script generation

while we can't just use -U$(SUBARCH), we still need to kill idiotic define
(implicit -Di386=1), both for SUBARCH=i386 and SUBARCH=x86/CONFIG_64BIT=n
builds.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 3cb42092 00341028

+7 -3
+4 -3
arch/um/kernel/Makefile
··· 3 3 # Licensed under the GPL 4 4 # 5 5 6 - CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \ 7 - -DELF_ARCH=$(LDS_ELF_ARCH) \ 8 - -DELF_FORMAT=$(LDS_ELF_FORMAT) 6 + CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \ 7 + -DELF_ARCH=$(LDS_ELF_ARCH) \ 8 + -DELF_FORMAT=$(LDS_ELF_FORMAT) \ 9 + $(LDS_EXTRA) 9 10 extra-y := vmlinux.lds 10 11 clean-files := 11 12
+3
arch/x86/Makefile.um
··· 14 14 15 15 export LDFLAGS 16 16 17 + LDS_EXTRA := -Ui386 18 + export LDS_EXTRA 19 + 17 20 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. 18 21 include $(srctree)/arch/x86/Makefile_32.cpu 19 22