Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / Documentation / kbuild / makefiles.txt

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 5198b742fde1608330b799015573ecf97277531e..d567a7cc552b670644e31b7bb6f7641012483602 100644 (file)
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -593,7 +593,7 @@ more details, with real examples.
 
        Example:
                #Makefile
-               LDFLAGS_vmlinux += $(call really-ld-option, -X)
+               LDFLAGS_vmlinux += $(call ld-option, -X)
 
 
 === 4 Host Program support
@@ -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