From 19a7573c652acdf79e0f75e4a94c5f9fb6059df2 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Sun, 20 May 2012 15:15:34 -0400
Subject: [PATCH] --- yaml --- r: 308085 b: refs/heads/master c:
 1fcb78e9da714d96f65edd37b29dae3b1f7df508 h: refs/heads/master i:   308083:
 9e4927a9bba5d993fc95eac37b23bf32e8cf6fef v: v3

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

diff --git a/[refs] b/[refs]
index c91e777b8a90..23df9020eef0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f1d62bed7f015d11b9164078b7fea433b474114
+refs/heads/master: 1fcb78e9da714d96f65edd37b29dae3b1f7df508
diff --git a/trunk/arch/tile/Makefile b/trunk/arch/tile/Makefile
index 9520bc5a4b7f..e20b0a0b64a1 100644
--- a/trunk/arch/tile/Makefile
+++ b/trunk/arch/tile/Makefile
@@ -34,7 +34,12 @@ LIBGCC_PATH     := \
   $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)
 
 # Provide the path to use for "make defconfig".
-KBUILD_DEFCONFIG := $(ARCH)_defconfig
+# We default to the newer TILE-Gx architecture if only "tile" is given.
+ifeq ($(ARCH),tile)
+        KBUILD_DEFCONFIG := tilegx_defconfig
+else
+        KBUILD_DEFCONFIG := $(ARCH)_defconfig
+endif
 
 # Used as a file extension when useful, e.g. head_$(BITS).o
 # Not needed for (e.g.) "$(CC) -m32" since the compiler automatically