[MIPS] Kbuild: Use the new cc-cross-prefix feature.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 10 insertions, 20 deletions

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 3efe117721aa..fd7124c1b75a 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -6,18 +6,6 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
-config CROSSCOMPILE
-        bool "Are you using a crosscompiler"
-        help
-          Say Y here if you are compiling the kernel on a different
-          architecture than the one it is intended to run on.  This is just a
-          convenience option which will select the appropriate value for
-          the CROSS_COMPILE make variable which otherwise has to be passed on
-          the command line from mips-linux-, mipsel-linux-, mips64-linux- and
-          mips64el-linux- as appropriate for a particular kernel configuration.
-          You will have to pass the value for CROSS_COMPILE manually if the
-          name prefix for your tools is different.
-
 config CMDLINE
         string "Default kernel command string"
         default ""
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 14164c2b8791..23c17755eca0 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -18,15 +18,15 @@ cflags-y :=
 # Select the object file format to substitute into the linker script.
 #
 ifdef CONFIG_CPU_LITTLE_ENDIAN
-32bit-tool-prefix       = mipsel-linux-
-64bit-tool-prefix       = mips64el-linux-
+32bit-tool-archpref     = mipsel
+64bit-tool-archpref     = mips64el
 32bit-bfd               = elf32-tradlittlemips
 64bit-bfd               = elf64-tradlittlemips
 32bit-emul              = elf32ltsmip
 64bit-emul              = elf64ltsmip
 else
-32bit-tool-prefix       = mips-linux-
-64bit-tool-prefix       = mips64-linux-
+32bit-tool-archpref     = mips
+64bit-tool-archpref     = mips64
 32bit-bfd               = elf32-tradbigmips
 64bit-bfd               = elf64-tradbigmips
 32bit-emul              = elf32btsmip
@@ -34,16 +34,18 @@ else
 endif
 
 ifdef CONFIG_32BIT
-tool-prefix             = $(32bit-tool-prefix)
+tool-archpref           = $(32bit-tool-archpref)
 UTS_MACHINE             := mips
 endif
 ifdef CONFIG_64BIT
-tool-prefix             = $(64bit-tool-prefix)
+tool-archpref           = $(64bit-tool-archpref)
 UTS_MACHINE             := mips64
 endif
 
-ifdef CONFIG_CROSSCOMPILE
-CROSS_COMPILE           := $(tool-prefix)
+ifneq ($(SUBARCH),$(ARCH))
+  ifeq ($(CROSS_COMPILE),)
+    CROSS_COMPILE := $(call cc-cross-prefix, $(tool-archpref)-linux-  $(tool-archpref)-gnu-linux-  $(tool-archpref)-unknown-gnu-linux-)
+  endif
 endif
 
 ifdef CONFIG_32BIT