summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/merge-target-features.cpp
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2015-07-08 01:00:30 +0000
committerAdrian Prantl <aprantl@apple.com>2015-07-08 01:00:30 +0000
commitbc068586ac2807bfb4030bd9c4789b6a12359a9c (patch)
treefdcff3ac303bc4cbeb4fab1fd5367e96568a0ccd /clang/test/Modules/merge-target-features.cpp
parent22302e5995544ceda622c939fb26a5f9f361d012 (diff)
downloadbcm5719-llvm-bc068586ac2807bfb4030bd9c4789b6a12359a9c.tar.gz
bcm5719-llvm-bc068586ac2807bfb4030bd9c4789b6a12359a9c.zip
Revert "Revert r241620 and follow-up commits" and move the initialization
of the llvm targets from clang/CodeGen into ClangCheck.cpp and CIndex.cpp. llvm-svn: 241653
Diffstat (limited to 'clang/test/Modules/merge-target-features.cpp')
-rw-r--r--clang/test/Modules/merge-target-features.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Modules/merge-target-features.cpp b/clang/test/Modules/merge-target-features.cpp
index 8b82c8a9789..938715dd6b1 100644
--- a/clang/test/Modules/merge-target-features.cpp
+++ b/clang/test/Modules/merge-target-features.cpp
@@ -1,6 +1,6 @@
// RUN: rm -rf %t
// RUN: cd %S
-//
+// REQUIRES: x86-registered-target
// RUN: %clang_cc1 -fmodules -x c++ -fmodules-cache-path=%t \
// RUN: -iquote Inputs/merge-target-features \
// RUN: -fno-implicit-modules \
OpenPOWER on IntegriCloud