aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-11-05 17:50:59 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 18:12:32 -0500
commitf15cf5151c3ecfe4073fb4478f686cb396bc2b17 (patch)
treedaef701195d26d7408ade4a140189b31708110bb /arch
parent4f40c05528f9d612057a3dd382008a54179f8919 (diff)
uml: correctly strip kernel defines from userspace CFLAGS
KERNEL_DEFINES needs whitespace trimmed, otherwise the 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> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 82c2ac48040d..768a5d14b755 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -70,9 +70,12 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
70# in KBUILD_CFLAGS. Otherwise, it would cause ld to complain about the two different 70# in KBUILD_CFLAGS. Otherwise, it would cause ld to complain about the two different
71# errnos. 71# errnos.
72# These apply to kernelspace only. 72# These apply to kernelspace only.
73#
74# strip leading and trailing whitespace to make the USER_CFLAGS removal of these
75# defines more robust
73 76
74KERNEL_DEFINES = -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \ 77KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
75 -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES) 78 -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
76KBUILD_CFLAGS += $(KERNEL_DEFINES) 79KBUILD_CFLAGS += $(KERNEL_DEFINES)
77KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,) 80KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
78 81