The patch titled uml: fix compilation options for USER_OBJS has been added to the -mm tree. Its filename is uml-fix-compilation-options-for-user_objs.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: fix compilation options for USER_OBJS From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Again, move inclusion of arch's Makefile after CFLAGS setting - I remember merging the same patch eons ago in 2.6, so I added a comment. I discovered this because debug info weren't enabled for USER_OBJS - they're compiled with USER_CFLAGS which is calculated from CFLAGS (the whole thing is a bit of an hack but fixing it is not easy, so we're leaving it as-is). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff -puN Makefile~uml-fix-compilation-options-for-user_objs Makefile --- a/Makefile~uml-fix-compilation-options-for-user_objs +++ a/Makefile @@ -489,8 +489,6 @@ else CFLAGS += -O2 endif -include $(srctree)/arch/$(ARCH)/Makefile - ifdef CONFIG_FRAME_POINTER CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,) else @@ -518,6 +516,10 @@ CFLAGS += $(call cc-option,-Wdeclaration # disable pointer signed / unsigned warnings in gcc 4.0 CFLAGS += $(call cc-option,-Wno-pointer-sign,) +# After setting CFLAGS correctly, read in arch's Makefile. UML needs to receive the +# correct value of CFLAGS. +include $(srctree)/arch/$(ARCH)/Makefile + # Default kernel image to build when no specific target is given. # KBUILD_IMAGE may be overruled on the command line or # set in the environment _ Patches currently in -mm which might be from blaisorblade@xxxxxxxx are uml-fix-compilation-options-for-user_objs.patch uml-revert-wrong-patch.patch uml-correct-removal-of-pte_mkexec.patch uml-readd-forgot-prototype.patch uml-make-tt-mode-compile-after-setjmp-related-changes.patch uml-make-uml_setjmp-always-safe.patch uml-fix-processor-selection-to-exclude-unsupported-processors-and-features.patch uml-fix-uname-under-setarch-i386.patch uml-declare-in-kconfig-our-partial-lockdep-support.patch uml-allow-using-again-x86-x86_64-crypto-code.patch uml-asm-offsets-duplication-removal.patch uml-remove-duplicate-export.patch uml-deprecate-config_mode_tt.patch uml-allow-finer-tuning-for-host-vmsplit-setting.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html