Merge remote-tracking branch 'origin/swift-3.0-branch' into stable
* origin/swift-3.0-branch:
clang/test/Modules/prebuilt-module.m: Prune "-triple" to fix a configuration mismatch.
diff --git a/test/Modules/prebuilt-module.m b/test/Modules/prebuilt-module.m
index 334fc5e..d5012e0 100644
--- a/test/Modules/prebuilt-module.m
+++ b/test/Modules/prebuilt-module.m
@@ -1,7 +1,7 @@
// RUN: rm -rf %t
//
-// RUN: %clang_cc1 -fmodules -x objective-c -I %S/Inputs/prebuilt-module -triple %itanium_abi_triple -emit-module %S/Inputs/prebuilt-module/module.modulemap -fmodule-name=prebuilt -o %t/prebuilt.pcm
-// RUN: %clang_cc1 -fmodules -triple %itanium_abi_triple -fprebuilt-module-path=%t/ -fdisable-module-hash %s -verify
+// RUN: %clang_cc1 -fmodules -x objective-c -I %S/Inputs/prebuilt-module -emit-module %S/Inputs/prebuilt-module/module.modulemap -fmodule-name=prebuilt -o %t/prebuilt.pcm
+// RUN: %clang_cc1 -fmodules -fprebuilt-module-path=%t/ -fdisable-module-hash %s -verify
// expected-no-diagnostics
@import prebuilt;
