um: fix linker script generation
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 9 Apr 2012 17:59:00 +0000 (13:59 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 9 Apr 2012 17:59:00 +0000 (13:59 -0400)
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>
arch/um/kernel/Makefile
arch/x86/Makefile.um

index 492bc4c1b62bf3516a996d81c24c05c494fcf8d5..65a1c3d690ea01c8af4e2d7ea2c74d95ab415ec2 100644 (file)
@@ -3,9 +3,10 @@
 # Licensed under the GPL
 #
 
-CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \
-                        -DELF_ARCH=$(LDS_ELF_ARCH)        \
-                        -DELF_FORMAT=$(LDS_ELF_FORMAT)
+CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START)           \
+                        -DELF_ARCH=$(LDS_ELF_ARCH)     \
+                        -DELF_FORMAT=$(LDS_ELF_FORMAT) \
+                       $(LDS_EXTRA)
 extra-y := vmlinux.lds
 clean-files :=
 
index 4be406abeefde51f1f3dd9419a799256ae1c1e1d..36b62bc52638368c750c250a529995cd8cac80cb 100644 (file)
@@ -14,6 +14,9 @@ LINK-y                        += $(call cc-option,-m32)
 
 export LDFLAGS
 
+LDS_EXTRA              := -Ui386
+export LDS_EXTRA
+
 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
 include $(srctree)/arch/x86/Makefile_32.cpu