aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-11-05 14:50:59 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 15:12:32 -0800
commitf15cf5151c3ecfe4073fb4478f686cb396bc2b17 (patch)
treedaef701195d26d7408ade4a140189b31708110bb /arch/um
parent4f40c05528f9d612057a3dd382008a54179f8919 (diff)
downloadkernel_samsung_espresso10-f15cf5151c3ecfe4073fb4478f686cb396bc2b17.zip
kernel_samsung_espresso10-f15cf5151c3ecfe4073fb4478f686cb396bc2b17.tar.gz
kernel_samsung_espresso10-f15cf5151c3ecfe4073fb4478f686cb396bc2b17.tar.bz2
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/um')
-rw-r--r--arch/um/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 82c2ac4..768a5d1 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -70,9 +70,12 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
# 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,)