Re: [uml-devel] [PATCH] Fix UML build on i386 Ubuntu Dapper

[Nishanth Aravamudan <nacc@us.ibm.com>]

On 29.06.2006 [13:56:26 -0700], Nishanth Aravamudan wrote:
> On 28.06.2006 [12:13:21 +0200], Blaisorblade wrote:
> > On Wednesday 28 June 2006 02:47, Nishanth Aravamudan wrote:
> > > On 27.06.2006 [11:31:28 -0700], Nishanth Aravamudan wrote:
> > > > On 27.06.2006 [16:56:13 +0200], Blaisorblade wrote:
> > > > > On Tuesday 27 June 2006 00:02, Nishanth Aravamudan wrote:
> > > > > > Hi Jeff,
> > > > > >
> > > > > > 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).
> > > > >
> > > > > Ok, it seemed strange but I understand the stuff... that's very
> > > > > interesting as this is the setup I'd wished to have since ages.
> > > > > I'll switch to it ASAP...
> > > >
> > > > Indeed :)
> > > >
> > > > > > 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@us.ibm.com>
> > > > >
> > > > > The first hunk (#undef i386) should be unnecessary given you
> > > > > specify -m64 (add it to CPPFLAGS too). Also it can/could be
> > > > > problematic for
> > >
> > > Hrm, I somehow overlooked the CPPFLAGS bit. Is it necessary? That
> > > wasn't changed for x86_64 and having not changed it for UML, it
> > > doesn't appear to have prevented the build from working on both
> > > x86_64 and i386 SUBARCHs here.
> > 
> > It shouldn't go in the general CPPFLAGS indeed.  I think that -m64 in
> > the preprocessor command used to build vmlinux.lds.S would be cleaner
> > than #undef i386... test it by preprocessing by hand and report, I'll
> > code the CPPFLAGS_vmlinux.lds.S = -m64 assignment (if it is exactly
> > this way) if it works.

<snip my e-mail sent before I saw Jeff had sent on the previous patch>

An incremental patch for Blaisorblade's idea follows. It builds
successfully here.

---

On top of the previous biarch changes for UML, this makes the
preprocessor changes a bit cleaner. Specify the 64-bit build in CPPFLAGS
on the x86_64 SUBARCH, rather than #undef'ing i386. Compile-tested with
i386 and x86_64 SUBARCHs.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

diff -urpN 2.6.17-dev2/arch/um/kernel/vmlinux.lds.S 2.6.17-dev/arch/um/kernel/vmlinux.lds.S
--- 2.6.17-dev2/arch/um/kernel/vmlinux.lds.S	2006-06-29 14:44:44.000000000 -0700
+++ 2.6.17-dev/arch/um/kernel/vmlinux.lds.S	2006-06-29 13:52:10.000000000 -0700
@@ -1,6 +1,4 @@
 #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 -urpN 2.6.17-dev2/arch/um/Makefile-x86_64 2.6.17-dev/arch/um/Makefile-x86_64
--- 2.6.17-dev2/arch/um/Makefile-x86_64	2006-06-29 14:44:54.000000000 -0700
+++ 2.6.17-dev/arch/um/Makefile-x86_64	2006-06-29 13:47:22.000000000 -0700
@@ -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

-- 
Nishanth Aravamudan <nacc@us.ibm.com>
IBM Linux Technology Center

Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel