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 /arch/ppc | |
| 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 'arch/ppc')
| -rw-r--r-- | arch/ppc/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index e719a4933af1..98e940beeb3b 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile | |||
| @@ -128,10 +128,9 @@ TOUT := .tmp_gas_check | |||
| 128 | # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec | 128 | # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec |
| 129 | # instructions. | 129 | # instructions. |
| 130 | # gcc-3.4 and binutils-2.14 are a fatal combination. | 130 | # gcc-3.4 and binutils-2.14 are a fatal combination. |
| 131 | GCC_VERSION := $(call cc-version) | ||
| 132 | 131 | ||
| 133 | checkbin: | 132 | checkbin: |
| 134 | @if test "$(GCC_VERSION)" = "0304" ; then \ | 133 | @if test "$(call cc-version)" = "0304" ; then \ |
| 135 | if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \ | 134 | if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \ |
| 136 | echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \ | 135 | echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \ |
| 137 | echo 'correctly with gcc-3.4 and your version of binutils.'; \ | 136 | echo 'correctly with gcc-3.4 and your version of binutils.'; \ |