aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kbuild
diff options
context:
space:
mode:
authorWanlong Gao <wanlong.gao@gmail.com>2011-06-13 05:53:53 -0400
committerJiri Kosina <jkosina@suse.cz>2011-06-13 07:43:05 -0400
commit25eb650a690b95cb0e2cf0c3b03f4900a59e0135 (patch)
treef36036bd8ae2bb9fe4865791ffc2ba4bad31f71b /Documentation/kbuild
parentc443453c6dc88576db540acc6ef40e1d2869e394 (diff)
doc: fix wrong arch/i386 references
Change all "arch/i386" to "arch/x86" in Documentaion/, since the directory has changed. Also update the files which have changed their filename in the meantime accordingly. Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> [jkosina@suse.cz: reword changelog] Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/kbuild')
-rw-r--r--Documentation/kbuild/makefiles.txt38
1 files changed, 19 insertions, 19 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 47435e56c5da..f47cdefb4d1e 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -441,7 +441,7 @@ more details, with real examples.
441 specified if first option are not supported. 441 specified if first option are not supported.
442 442
443 Example: 443 Example:
444 #arch/i386/kernel/Makefile 444 #arch/x86/kernel/Makefile
445 vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) 445 vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
446 446
447 In the above example, vsyscall-flags will be assigned the option 447 In the above example, vsyscall-flags will be assigned the option
@@ -460,7 +460,7 @@ more details, with real examples.
460 supported to use an optional second option. 460 supported to use an optional second option.
461 461
462 Example: 462 Example:
463 #arch/i386/Makefile 463 #arch/x86/Makefile
464 cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586) 464 cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586)
465 465
466 In the above example, cflags-y will be assigned the option 466 In the above example, cflags-y will be assigned the option
@@ -522,7 +522,7 @@ more details, with real examples.
522 even though the option was accepted by gcc. 522 even though the option was accepted by gcc.
523 523
524 Example: 524 Example:
525 #arch/i386/Makefile 525 #arch/x86/Makefile
526 cflags-y += $(shell \ 526 cflags-y += $(shell \
527 if [ $(call cc-version) -ge 0300 ] ; then \ 527 if [ $(call cc-version) -ge 0300 ] ; then \
528 echo "-mregparm=3"; fi ;) 528 echo "-mregparm=3"; fi ;)
@@ -802,7 +802,7 @@ but in the architecture makefiles where the kbuild infrastructure
802is not sufficient this sometimes needs to be explicit. 802is not sufficient this sometimes needs to be explicit.
803 803
804 Example: 804 Example:
805 #arch/i386/boot/Makefile 805 #arch/x86/boot/Makefile
806 subdir- := compressed/ 806 subdir- := compressed/
807 807
808The above assignment instructs kbuild to descend down in the 808The above assignment instructs kbuild to descend down in the
@@ -812,12 +812,12 @@ To support the clean infrastructure in the Makefiles that builds the
812final bootimage there is an optional target named archclean: 812final bootimage there is an optional target named archclean:
813 813
814 Example: 814 Example:
815 #arch/i386/Makefile 815 #arch/x86/Makefile
816 archclean: 816 archclean:
817 $(Q)$(MAKE) $(clean)=arch/i386/boot 817 $(Q)$(MAKE) $(clean)=arch/x86/boot
818 818
819When "make clean" is executed, make will descend down in arch/i386/boot, 819When "make clean" is executed, make will descend down in arch/x86/boot,
820and clean as usual. The Makefile located in arch/i386/boot/ may use 820and clean as usual. The Makefile located in arch/x86/boot/ may use
821the subdir- trick to descend further down. 821the subdir- trick to descend further down.
822 822
823Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is 823Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is
@@ -882,7 +882,7 @@ When kbuild executes, the following steps are followed (roughly):
882 LDFLAGS_vmlinux uses the LDFLAGS_$@ support. 882 LDFLAGS_vmlinux uses the LDFLAGS_$@ support.
883 883
884 Example: 884 Example:
885 #arch/i386/Makefile 885 #arch/x86/Makefile
886 LDFLAGS_vmlinux := -e stext 886 LDFLAGS_vmlinux := -e stext
887 887
888 OBJCOPYFLAGS objcopy flags 888 OBJCOPYFLAGS objcopy flags
@@ -920,14 +920,14 @@ When kbuild executes, the following steps are followed (roughly):
920 Often, the KBUILD_CFLAGS variable depends on the configuration. 920 Often, the KBUILD_CFLAGS variable depends on the configuration.
921 921
922 Example: 922 Example:
923 #arch/i386/Makefile 923 #arch/x86/Makefile
924 cflags-$(CONFIG_M386) += -march=i386 924 cflags-$(CONFIG_M386) += -march=i386
925 KBUILD_CFLAGS += $(cflags-y) 925 KBUILD_CFLAGS += $(cflags-y)
926 926
927 Many arch Makefiles dynamically run the target C compiler to 927 Many arch Makefiles dynamically run the target C compiler to
928 probe supported options: 928 probe supported options:
929 929
930 #arch/i386/Makefile 930 #arch/x86/Makefile
931 931
932 ... 932 ...
933 cflags-$(CONFIG_MPENTIUMII) += $(call cc-option,\ 933 cflags-$(CONFIG_MPENTIUMII) += $(call cc-option,\
@@ -1038,8 +1038,8 @@ When kbuild executes, the following steps are followed (roughly):
1038 into the arch/$(ARCH)/boot/Makefile. 1038 into the arch/$(ARCH)/boot/Makefile.
1039 1039
1040 Example: 1040 Example:
1041 #arch/i386/Makefile 1041 #arch/x86/Makefile
1042 boot := arch/i386/boot 1042 boot := arch/x86/boot
1043 bzImage: vmlinux 1043 bzImage: vmlinux
1044 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 1044 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
1045 1045
@@ -1051,7 +1051,7 @@ When kbuild executes, the following steps are followed (roughly):
1051 To support this, $(archhelp) must be defined. 1051 To support this, $(archhelp) must be defined.
1052 1052
1053 Example: 1053 Example:
1054 #arch/i386/Makefile 1054 #arch/x86/Makefile
1055 define archhelp 1055 define archhelp
1056 echo '* bzImage - Image (arch/$(ARCH)/boot/bzImage)' 1056 echo '* bzImage - Image (arch/$(ARCH)/boot/bzImage)'
1057 endif 1057 endif
@@ -1065,7 +1065,7 @@ When kbuild executes, the following steps are followed (roughly):
1065 from vmlinux. 1065 from vmlinux.
1066 1066
1067 Example: 1067 Example:
1068 #arch/i386/Makefile 1068 #arch/x86/Makefile
1069 all: bzImage 1069 all: bzImage
1070 1070
1071 When "make" is executed without arguments, bzImage will be built. 1071 When "make" is executed without arguments, bzImage will be built.
@@ -1083,7 +1083,7 @@ When kbuild executes, the following steps are followed (roughly):
1083 2) kbuild knows what files to delete during "make clean" 1083 2) kbuild knows what files to delete during "make clean"
1084 1084
1085 Example: 1085 Example:
1086 #arch/i386/kernel/Makefile 1086 #arch/x86/kernel/Makefile
1087 extra-y := head.o init_task.o 1087 extra-y := head.o init_task.o
1088 1088
1089 In this example, extra-y is used to list object files that 1089 In this example, extra-y is used to list object files that
@@ -1133,7 +1133,7 @@ When kbuild executes, the following steps are followed (roughly):
1133 Compress target. Use maximum compression to compress target. 1133 Compress target. Use maximum compression to compress target.
1134 1134
1135 Example: 1135 Example:
1136 #arch/i386/boot/Makefile 1136 #arch/x86/boot/Makefile
1137 LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary 1137 LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
1138 LDFLAGS_setup := -Ttext 0x0 -s --oformat binary -e begtext 1138 LDFLAGS_setup := -Ttext 0x0 -s --oformat binary -e begtext
1139 1139
@@ -1193,7 +1193,7 @@ When kbuild executes, the following steps are followed (roughly):
1193 1193
1194 When updating the $(obj)/bzImage target, the line 1194 When updating the $(obj)/bzImage target, the line
1195 1195
1196 BUILD arch/i386/boot/bzImage 1196 BUILD arch/x86/boot/bzImage
1197 1197
1198 will be displayed with "make KBUILD_VERBOSE=0". 1198 will be displayed with "make KBUILD_VERBOSE=0".
1199 1199
@@ -1207,7 +1207,7 @@ When kbuild executes, the following steps are followed (roughly):
1207 kbuild knows .lds files and includes a rule *lds.S -> *lds. 1207 kbuild knows .lds files and includes a rule *lds.S -> *lds.
1208 1208
1209 Example: 1209 Example:
1210 #arch/i386/kernel/Makefile 1210 #arch/x86/kernel/Makefile
1211 always := vmlinux.lds 1211 always := vmlinux.lds
1212 1212
1213 #Makefile 1213 #Makefile