Re: [uml-devel] User Mode Linux still doesn't build in 2.6.23-final.

Jeff Dike
2007-10-22T20:25:13Z

On Sun, Oct 21, 2007 at 04:43:46PM +0100, Al Viro wrote:
> Fallout continues; I've got a preliminary patch for it. Basically, we
> need to stop doing -U__i386__ et.al.

Thanks, Al. You need the patch below in order to get a working UML -
feel free to fold it into this.

Jeff

--
Work email - jdike at linux dot intel dot com

KERNEL_DEFINES needs whitespace trimmed, otherwise this whitespace
crunching done by make fools the patsubst which is used to remove
KERNEL_DEFINES from USER_CFLAGS.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
arch/um/Makefile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/um/Makefile
===================================================================
--- linux-2.6.orig/arch/um/Makefile 2007-10-22 16:19:38.000000000 -0400
+++ linux-2.6/arch/um/Makefile 2007-10-22 16:19:44.000000000 -0400
@@ -70,9 +70,12 @@ include $(srctree)/$(ARCH_DIR)/Makefile-
# in KBUILD_CFLAGS. Otherwise, it would cause ld to complain about the two different
# errnos.
# These apply to kernelspace only.
+#
+# strip leading and trailing whitespace to make the USER_CFLAGS removal of these
+# defines more robust

-KERNEL_DEFINES = -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
- -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES)
+KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
+ -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
KBUILD_CFLAGS += $(KERNEL_DEFINES)
KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)