The patch titled
uml: fix biarch gcc build on x86_64
has been added to the -mm tree. Its filename is
uml-fix-biarch-gcc-build-on-x86_64.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: fix biarch gcc build on x86_64
From: Jeff Dike <jdike@xxxxxxxxxxx>
I run an x86_64 kernel with i386 userspace (Ubuntu Dapper) and decided to try
out UML today. I found that UML wasn't quite aware of biarch compilers (which
Ubuntu i386 ships). A fix similar to what was done for x86_64 should probably
be committed (see
http://marc.theaimsgroup.com/?l=linux-kernel&m=113425940204010&w=2). Without
the FLAGS changes, the build will fail at a number of places and without the
LINK change, the final link will fail.
Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/Makefile-x86_64 | 7 +++++--
arch/um/kernel/vmlinux.lds.S | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff -puN arch/um/kernel/vmlinux.lds.S~uml-fix-biarch-gcc-build-on-x86_64 arch/um/kernel/vmlinux.lds.S
--- a/arch/um/kernel/vmlinux.lds.S~uml-fix-biarch-gcc-build-on-x86_64
+++ a/arch/um/kernel/vmlinux.lds.S
@@ -1,4 +1,6 @@
#include <linux/config.h>
+/* in case the preprocessor is a 32bit one */
+#undef i386
#ifdef CONFIG_LD_SCRIPT_STATIC
#include "uml.lds.S"
#else
diff -puN arch/um/Makefile-x86_64~uml-fix-biarch-gcc-build-on-x86_64 arch/um/Makefile-x86_64
--- a/arch/um/Makefile-x86_64~uml-fix-biarch-gcc-build-on-x86_64
+++ a/arch/um/Makefile-x86_64
@@ -6,9 +6,11 @@ START := 0x60000000
#We #undef __x86_64__ for kernelspace, not for userspace where
#it's needed for headers to work!
-CFLAGS += -U__$(SUBARCH)__ -fno-builtin
-USER_CFLAGS += -fno-builtin
+CFLAGS += -U__$(SUBARCH)__ -fno-builtin -m64
+USER_CFLAGS += -fno-builtin -m64
CHECKFLAGS += -m64
+AFLAGS += -m64
+LDFLAGS += -m elf_x86_64
ELF_ARCH := i386:x86-64
ELF_FORMAT := elf64-x86-64
@@ -16,3 +18,4 @@ ELF_FORMAT := elf64-x86-64
# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
+LINK-y += -m64
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
fix-the-init_env_arg_limit-dependencies.patch
uml-fix-proc-mounts-parsing-boundary-condition.patch
uml-fix-off-by-one-bug-in-vm-file-creation.patch
uml-remove-pte_mkexec.patch
uml-unregister-useless-console-when-its-not-needed.patch
uml-add-locking-to-xtime-accesses.patch
uml-remove-unneeded-time-definitions.patch
uml-remove-stray-file.patch
uml-fix-biarch-gcc-build-on-x86_64.patch
uml-add-__raw_writeq-definition.patch
uml-make-copy__user-atomic.patch
uml-fix-not_dead_yet-when-directory-is-in-bad-state.patch
uml-rename-and-improve-actually_do_remove.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
