---

yaml
---
r: 345573
b: refs/heads/master
c: 37a6fac
h: refs/heads/master
i:
  345571: ea75cf9

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a567e61233ece1f3a4e2d9d281c934cd618eeccd
+refs/heads/master: 37a6fac5e12a45585fdf112f6719d64431fabbba
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Driver/UnixToolChains.cpp

@@ -340,13 +340,13 @@ toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
 }
 
 std::string toolchains::Android::getTargetForLinker() const {
-  // Explicitly set the linker target to "androideabi", as opposed to the
-  // llvm::Triple representation of "armv7-none-linux-android".
-  // This is the only ABI we currently support for Android.
-  assert(getTriple().getArch() == llvm::Triple::arm &&
-         getTriple().getSubArch() == llvm::Triple::SubArchType::ARMSubArch_v7 &&
-         "Only armv7 targets are supported for Android");
-  return "armv7-none-linux-androideabi";
+  const llvm::Triple &T = getTriple();
+  if (T.getArch() == llvm::Triple::arm &&
+      T.getSubArch() == llvm::Triple::SubArchType::ARMSubArch_v7)
+    // Explicitly set the linker target to "androideabi", as opposed to the
+    // llvm::Triple representation of "armv7-none-linux-android".
+    return "armv7-none-linux-androideabi";
+  return T.str();
 }
 
 bool toolchains::Android::shouldProvideRPathToLinker() const { return false; }