diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
| commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
| tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /Documentation | |
| parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
| parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index d802ce88bed..443230b43e0 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt | |||
| @@ -1033,9 +1033,9 @@ When kbuild executes the following steps are followed (roughly): | |||
| 1033 | 1033 | ||
| 1034 | Example: | 1034 | Example: |
| 1035 | #arch/i386/Makefile | 1035 | #arch/i386/Makefile |
| 1036 | GCC_VERSION := $(call cc-version) | ||
| 1037 | cflags-y += $(shell \ | 1036 | cflags-y += $(shell \ |
| 1038 | if [ $(GCC_VERSION) -ge 0300 ] ; then echo "-mregparm=3"; fi ;) | 1037 | if [ $(call cc-version) -ge 0300 ] ; then \ |
| 1038 | echo "-mregparm=3"; fi ;) | ||
| 1039 | 1039 | ||
| 1040 | In the above example -mregparm=3 is only used for gcc version greater | 1040 | In the above example -mregparm=3 is only used for gcc version greater |
| 1041 | than or equal to gcc 3.0. | 1041 | than or equal to gcc 3.0. |