diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:21:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:21:33 (GMT) |
| commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
| tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /arch/ppc | |
| parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
| parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) | |
| download | linux-fsl-qoriq-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.tar.xz | |
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 e719a49..98e940b 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -128,10 +128,9 @@ TOUT := .tmp_gas_check # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec # instructions. # gcc-3.4 and binutils-2.14 are a fatal combination. -GCC_VERSION := $(call cc-version) checkbin: - @if test "$(GCC_VERSION)" = "0304" ; then \ + @if test "$(call cc-version)" = "0304" ; then \ if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \ echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \ echo 'correctly with gcc-3.4 and your version of binutils.'; \ |