File backport-clang-r233807 of Package llvm

------------------------------------------------------------------------
r233807 | uweigand | 2015-04-01 16:15:35 +0200 (Wed, 01 Apr 2015) | 9 lines

[SystemZ] Add header files to Makefile / module.modulemap

This should fix build-bot failures after r233804.

The patch also adds a "systemz" feature, and renames the
"transactional-execution" feature to "htm", since it turns
out "-" is not a legal character in module feature names.


------------------------------------------------------------------------
Index: tools/clang/lib/Headers/CMakeLists.txt
===================================================================
--- tools/clang/lib/Headers/CMakeLists.txt.orig
+++ tools/clang/lib/Headers/CMakeLists.txt
@@ -10,6 +10,8 @@ set(files
   float.h
   fma4intrin.h
   fmaintrin.h
+  htmintrin.h
+  htmxlintrin.h
   immintrin.h
   iso646.h
   Intrin.h
@@ -24,6 +26,7 @@ set(files
   prfchwintrin.h
   rdseedintrin.h
   rtmintrin.h
+  s390intrin.h
   shaintrin.h
   smmintrin.h
   stdalign.h
Index: tools/clang/lib/Basic/Targets.cpp
===================================================================
--- tools/clang/lib/Basic/Targets.cpp.orig
+++ tools/clang/lib/Basic/Targets.cpp
@@ -4672,7 +4672,8 @@ namespace {
 
     virtual bool hasFeature(StringRef Feature) const {
       return llvm::StringSwitch<bool>(Feature)
-          .Case("transactional-execution", HasTransactionalExecution)
+          .Case("systemz", true)
+          .Case("htm", HasTransactionalExecution)
           .Default(false);
     }
   };