Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[mirror_ubuntu-artful-kernel.git] / Documentation / kbuild / makefiles.txt

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 5836294fdbf700192842d661c5d447f1114a483c..d567a7cc552b670644e31b7bb6f7641012483602 100644 (file)
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -921,8 +921,9 @@ When kbuild executes, the following steps are followed (roughly):
        Often, the KBUILD_CFLAGS variable depends on the configuration.
 
        Example:
-               #arch/x86/Makefile
-               cflags-$(CONFIG_M386) += -march=i386
+               #arch/x86/boot/compressed/Makefile
+               cflags-$(CONFIG_X86_32) := -march=i386
+               cflags-$(CONFIG_X86_64) := -mcmodel=small
                KBUILD_CFLAGS += $(cflags-y)
 
        Many arch Makefiles dynamically run the target C compiler to