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

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  modpost: support objects with more than 64k sections
  trivial: fix a typo in a filename
  frv: clean up arch/frv/Makefile
  kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line
  kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line
  Kbuild: Add option to set -femit-struct-debug-baseonly
  Makefile: "make kernelrelease" should show the correct full kernel version
  Makefile.build: make KBUILD_SYMTYPES work again

1 files changed, 22 insertions, 5 deletions

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 8abd041b605..c375313cb12 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -921,16 +921,33 @@ When kbuild executes, the following steps are followed (roughly):
         The first example utilises the trick that a config option expands
         to 'y' when selected.
 
-    CFLAGS_KERNEL       $(CC) options specific for built-in
+    KBUILD_AFLAGS_KERNEL        $(AS) options specific for built-in
 
-        $(CFLAGS_KERNEL) contains extra C compiler flags used to compile
+        $(KBUILD_AFLAGS_KERNEL) contains extra C compiler flags used to compile
         resident kernel code.
 
-    CFLAGS_MODULE       $(CC) options specific for modules
+    KBUILD_AFLAGS_MODULE   Options for $(AS) when building modules
 
-        $(CFLAGS_MODULE) contains extra C compiler flags used to compile code
-        for loadable kernel modules.
+        $(KBUILD_AFLAGS_MODULE) is used to add arch specific options that
+        are used for $(AS).
+        From commandline AFLAGS_MODULE shall be used (see kbuild.txt).
 
+    KBUILD_CFLAGS_KERNEL        $(CC) options specific for built-in
+
+        $(KBUILD_CFLAGS_KERNEL) contains extra C compiler flags used to compile
+        resident kernel code.
+
+    KBUILD_CFLAGS_MODULE   Options for $(CC) when building modules
+
+        $(KBUILD_CFLAGS_MODULE) is used to add arch specific options that
+        are used for $(CC).
+        From commandline CFLAGS_MODULE shall be used (see kbuild.txt).
+
+    KBUILD_LDFLAGS_MODULE   Options for $(LD) when linking modules
+
+        $(KBUILD_LDFLAGS_MODULE) is used to add arch specific options
+        used when linking modules. This is often a linker script.
+        From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).
 
 --- 6.2 Add prerequisites to archprepare: