2005-11-01 20:44:50

by Blaisorblade

Subject: [PATCH 1/2] uml: build host-binaries with the native host arch again

From: Paolo 'Blaisorblade' Giarrusso <[email protected]>

This patch reverts back the changes to HOSTCFLAGS and HOSTLDFLAGS

When we were building complete binaries to get constants (such as ptrace
register layout on stack) from host userspace headers, we needed to make the
arch for building HOST binaries match our one: i.e. on a 64bit system compiling
32bit binaries, we compile 32-bit hostprogs and need, say, 32-bit ncurses. Now
we can revert that - that avoids problem with, say, menuconfig and ncurses, on a
system which can't compile well 32-bit programs.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

arch/um/Makefile-i386 | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -17,8 +17,6 @@ ifeq ("$(origin SUBARCH)", "command line
ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
CFLAGS += $(call cc-option,-m32)
USER_CFLAGS += $(call cc-option,-m32)
-HOSTCFLAGS += $(call cc-option,-m32)
-HOSTLDFLAGS += $(call cc-option,-m32)
AFLAGS += $(call cc-option,-m32)
LINK-y += $(call cc-option,-m32)
UML_OBJCOPYFLAGS += -F $(ELF_FORMAT)

2005-11-01 20:44:49

by Blaisorblade

Subject: [PATCH 2/2] uml: add missing header

From: Paolo 'Blaisorblade' Giarrusso <[email protected]>

We now need to include the new <linux/platform_device.h> explicitly, due to
headers changes.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

arch/um/include/net_kern.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h
--- a/arch/um/include/net_kern.h
+++ b/arch/um/include/net_kern.h
@@ -10,6 +10,7 @@
#include "linux/skbuff.h"
#include "linux/socket.h"
#include "linux/list.h"
+#include "linux/platform_device.h"

struct uml_net {
struct list_head list;