From 390e50c9992fdb6f19dc55bfe0e3e3aee937587b Mon Sep 17 00:00:00 2001
From: William Dillon <william@housedillon.com>
Date: Sat, 20 Feb 2016 03:12:46 +0000
Subject: [PATCH] Added thumb to supported platforms conditions

---
 lib/Basic/LangOptions.cpp |  1 +
 test/Driver/linker.swift  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/lib/Basic/LangOptions.cpp b/lib/Basic/LangOptions.cpp
index 0776f30d8cf49..ac47568d253e4 100644
--- a/lib/Basic/LangOptions.cpp
+++ b/lib/Basic/LangOptions.cpp
@@ -117,6 +117,7 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
   // Set the "arch" platform condition.
   switch (Target.getArch()) {
   case llvm::Triple::ArchType::arm:
+  case llvm::Triple::ArchType::thumb:
     addPlatformConditionValue("arch", "arm");
     break;
   case llvm::Triple::ArchType::aarch64:
diff --git a/test/Driver/linker.swift b/test/Driver/linker.swift
index e20338a831e04..0ef40f7a2c3db 100644
--- a/test/Driver/linker.swift
+++ b/test/Driver/linker.swift
@@ -20,6 +20,9 @@
 // RUN: %swiftc_driver -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
 // RUN: FileCheck -check-prefix LINUX-armv7 %s < %t.linux.txt
 
+// RUN: %swiftc_driver -driver-print-jobs -target thumbv7-unknown-linux-gnueabihf -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
+// RUN: FileCheck -check-prefix LINUX-thumbv7 %s < %t.linux.txt
+
 // RUN: %swiftc_driver -driver-print-jobs -emit-library -target x86_64-apple-macosx10.9.1 %s -sdk %S/../Inputs/clang-importer-sdk -lfoo -framework bar -Lbaz -Fgarply -Xlinker -undefined -Xlinker dynamic_lookup -o sdk.out 2>&1 > %t.complex.txt
 // RUN: FileCheck %s < %t.complex.txt
 // RUN: FileCheck -check-prefix COMPLEX %s < %t.complex.txt
@@ -147,6 +150,22 @@
 // LINUX-armv7-DAG: -Xlinker -undefined
 // LINUX-armv7: -o linker
 
+// LINUX-thumbv7: swift
+// LINUX-thumbv7: -o [[OBJECTFILE:.*]]
+
+// LINUX-thumbv7: clang++{{"? }}
+// LINUX-thumbv7-DAG: [[OBJECTFILE]]
+// LINUX-thumbv7-DAG: -lswiftCore
+// LINUX-thumbv7-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]]
+// LINUX-thumbv7-DAG: --target=thumbv7-unknown-linux-gnueabihf
+// LINUX-thumbv7-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]]
+// LINUX-thumbv7-DAG: -F foo
+// LINUX-thumbv7-DAG: -framework bar
+// LINUX-thumbv7-DAG: -L baz
+// LINUX-thumbv7-DAG: -lboo
+// LINUX-thumbv7-DAG: -Xlinker -undefined
+// LINUX-thumbv7: -o linker
+
 // COMPLEX: bin/ld{{"? }}
 // COMPLEX-DAG: -dylib
 // COMPLEX-DAG: -syslibroot {{.*}}/Inputs/clang-importer-sdk