From 9fa59f54d83fb5ea258abd15bba181535d4ba9a1 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 4 Feb 2008 22:30:17 -0800
Subject: [PATCH] --- yaml --- r: 83140 b: refs/heads/master c:
 6f7127db311fe3e0ea6a2a332833f85abab6cb4b h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/arch/m68k/Makefile | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a43d3825b2f6..9c6105800ce7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3506e0c49a5ceba72c0405d1a470184c2d6705f7
+refs/heads/master: 6f7127db311fe3e0ea6a2a332833f85abab6cb4b
diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
index 4a1bd44ff162..2cba605cb59d 100644
--- a/trunk/arch/m68k/Makefile
+++ b/trunk/arch/m68k/Makefile
@@ -13,16 +13,15 @@
 # Copyright (C) 1994 by Hamish Macdonald
 #
 
-# test for cross compiling
-COMPILE_ARCH = $(shell uname -m)
-
 # override top level makefile
 AS += -m68020
 LDFLAGS := -m m68kelf
 LDFLAGS_MODULE += -T $(srctree)/arch/m68k/kernel/module.lds
-ifneq ($(COMPILE_ARCH),$(ARCH))
-	# prefix for cross-compiling binaries
-	CROSS_COMPILE = m68k-linux-gnu-
+ifneq ($(SUBARCH),$(ARCH))
+	ifeq ($(CROSS_COMPILE),)
+		CROSS_COMPILE := $(call cc-cross-prefix, \
+			m68k-linux-gnu- m68k-linux- m68k-unknown-linux-gnu-)
+	endif
 endif
 
 ifdef CONFIG_SUN3