Index: lib/Driver/ToolChains.cpp
===================================================================
--- lib/Driver/ToolChains.cpp	(revision 167678)
+++ lib/Driver/ToolChains.cpp	(working copy)
@@ -1064,7 +1064,8 @@
     "x86_64-suse-linux",
     "x86_64-manbo-linux-gnu",
     "x86_64-linux-gnu",
-    "x86_64-slackware-linux"
+    "x86_64-slackware-linux",
+    "x86_64-amazon-linux"
   };
   static const char *const X86LibDirs[] = { "/lib32", "/lib" };
   static const char *const X86Triples[] = {
@@ -1077,7 +1078,8 @@
     "i386-redhat-linux",
     "i586-suse-linux",
     "i486-slackware-linux",
-    "i686-montavista-linux"
+    "i686-montavista-linux",
+    "i686-amazon-linux"
   };
 
   static const char *const MIPSLibDirs[] = { "/lib" };
Index: test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/crtbegin.o
===================================================================
--- test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/crtbegin.o	(revision 0)
+++ test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/crtbegin.o	(working copy)
@@ -0,0 +1 @@
+dummy file for gcc toolchain detection (crtbegin.o)
Index: test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/libgcc.a
===================================================================
--- test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/libgcc.a	(revision 0)
+++ test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/libgcc.a	(working copy)
@@ -0,0 +1 @@
+dummy file for gcc toolchain detection (libgcc.a)
Index: test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/32/crtbegin.o
===================================================================
--- test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/32/crtbegin.o	(revision 0)
+++ test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/32/crtbegin.o	(working copy)
@@ -0,0 +1 @@
+dummy file for gcc toolchain detection (crtbegin.o)
Index: test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/32/libgcc.a
===================================================================
--- test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/32/libgcc.a	(revision 0)
+++ test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/32/libgcc.a	(working copy)
@@ -0,0 +1 @@
+dummy file for gcc toolchain detection (libgcc.a)
Index: test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/crtbegin.o
===================================================================
--- test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/crtbegin.o	(revision 0)
+++ test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/crtbegin.o	(working copy)
@@ -0,0 +1 @@
+dummy file for gcc toolchain detection (crtbegin.o)
Index: test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/libgcc.a
===================================================================
--- test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/libgcc.a	(revision 0)
+++ test/Driver/Inputs/amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/libgcc.a	(working copy)
@@ -0,0 +1 @@
+dummy file for gcc toolchain detection (libgcc.a)
Index: test/Driver/amazon-gcc-toolchain.c
===================================================================
--- test/Driver/amazon-gcc-toolchain.c	(revision 0)
+++ test/Driver/amazon-gcc-toolchain.c	(working copy)
@@ -0,0 +1,17 @@
+// Test that the Amazon gcc-toolchain is correctly detected.
+//
+// RUN: %clang -print-libgcc-file-name 2>&1 \
+// RUN:     -target x86_64-amazon-linux \
+// RUN:     -gcc-toolchain %S/Inputs/amazon_multiarch_tree/usr \
+// RUN:   | FileCheck --check-prefix=CHECK-X86_64 %s
+//
+// Test for x86_64 toolchain detection.
+// CHECK-X86_64: amazon_multiarch_tree/usr/lib/gcc/x86_64-amazon-linux/4.6.2/libgcc.a
+//
+// RUN: %clang -print-libgcc-file-name 2>&1 \
+// RUN:     -target i686-amazon-linux \
+// RUN:     -gcc-toolchain %S/Inputs/amazon_multiarch_tree/usr \
+// RUN:   | FileCheck --check-prefix=CHECK-I686 %s
+//
+// Test for i686 toolchain detection.
+// CHECK-I686: amazon_multiarch_tree/usr/lib/gcc/i686-amazon-linux/4.6.2/libgcc.a