From 38f4ced76ed772f46a93c05e3f9123eced6004e5 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Fri, 14 Jul 2006 00:24:03 -0700 Subject: [PATCH] --- yaml --- r: 32624 b: refs/heads/master c: b076bb02ee2c489da36c89e35c640bfe45c7d27e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/Makefile-x86_64 | 1 + trunk/arch/um/kernel/vmlinux.lds.S | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a77e30abd5d..5361144de709 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5df0d1a2c0f7dbd135d978d02daf2d99e62ff7a +refs/heads/master: b076bb02ee2c489da36c89e35c640bfe45c7d27e diff --git a/trunk/arch/um/Makefile-x86_64 b/trunk/arch/um/Makefile-x86_64 index dffd1184c956..9558a7cf34d5 100644 --- a/trunk/arch/um/Makefile-x86_64 +++ b/trunk/arch/um/Makefile-x86_64 @@ -11,6 +11,7 @@ USER_CFLAGS += -fno-builtin -m64 CHECKFLAGS += -m64 AFLAGS += -m64 LDFLAGS += -m elf_x86_64 +CPPFLAGS += -m64 ELF_ARCH := i386:x86-64 ELF_FORMAT := elf64-x86-64 diff --git a/trunk/arch/um/kernel/vmlinux.lds.S b/trunk/arch/um/kernel/vmlinux.lds.S index 72acdce205e0..f8aeb448aab6 100644 --- a/trunk/arch/um/kernel/vmlinux.lds.S +++ b/trunk/arch/um/kernel/vmlinux.lds.S @@ -1,5 +1,3 @@ -/* in case the preprocessor is a 32bit one */ -#undef i386 #ifdef CONFIG_LD_SCRIPT_STATIC #include "uml.lds.S" #else