Re: [GIT PULL] UML changes for 3.2

From: Paul Bolle
Date: Sat Nov 05 2011 - 07:48:54 EST


(Added Sam Ravnborg. Dropped Linus Torvalds and Andrew Morton, who by
now probably prefer not getting this message directly.)

On Fri, 2011-11-04 at 11:41 +0100, Michal Marek wrote:
> I doub't kxgettext needs $SUBARCH at all, it only cares about the
> prompts and help texts, it does not evaluate any kconfig symbols.

0) That seems correct. But the fact is that kxgettext calls conf_parse()
right away, and that somehow triggers
menu_add_option()
prop_add_env()

and that last function will print this warning. Mucking about in all
that code to make this warning disappear seems wrong.

1) A straightforward fix could be:
diff --git a/Makefile b/Makefile
index 07bc925..2b8ee64 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
# "make" in the configured kernel build directory always uses that.
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
-export KBUILD_BUILDHOST := $(SUBARCH)
+export SUBARCH
ARCH ?= $(SUBARCH)
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 08dce14..9e178f6 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -66,7 +66,7 @@ modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
# Stop after building .o files if NOFINAL is set. Makes compile tests quicker
_modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules))

-ifneq ($(KBUILD_BUILDHOST),$(ARCH))
+ifneq ($(SUBARCH),$(ARCH))
cross_build := 1
endif


KBUILD_BUILDHOST was introduced in commit 4ce6efed ("kbuild: soften
modpost checks when doing cross builds"). It's an alias of SUBARCH
that's used just once. It's not clear to me why SUBARCH can't be used
directly instead of that alias.

2) Using SUBARCH directly (and dropping KBUILD_BUILDHOST) makes this
warning go away. Could that break anything?


Paul Bolle

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/