[PATCH] systemz: allow configuring default SYSTEMZ_DEFAULT_ARCH.

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
Gbp-Pq: Name 0001-systemz-allow-configuring-default-SYSTEMZ_DEFAULT_AR.patch

diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index dc1413f4b597209a250998759711af776f8165df..c594cd924fda0b60b0fca1dc2cc6f64f21e0e81b 100644 (file)
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -306,6 +306,10 @@ if (NOT DEFINED MATCHED_ARCH OR "${CMAKE_MATCH_1}" LESS 35)
     "Default architecture for OpenMP offloading to Nvidia GPUs." FORCE)
 endif()
 
+set(CLANG_SYSTEMZ_DEFAULT_ARCH "z10" CACHE STRING
+  "SystemZ Default Arch")
+add_definitions( -DCLANG_SYSTEMZ_DEFAULT_ARCH="${CLANG_SYSTEMZ_DEFAULT_ARCH}")
+
 set(CLANG_VENDOR ${PACKAGE_VENDOR} CACHE STRING
   "Vendor-specific text for showing with version information.")
 

diff --git a/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp b/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp
index 2b77d59fdc66b62591165768edda4eebba1b064b..37926155f93ddf01f9e08a46ae4bb6c1e7b50f63 100644 (file)
--- a/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp
@@ -30,7 +30,7 @@ std::string systemz::getSystemZTargetCPU(const ArgList &Args) {
 
     return CPUName;
   }
-  return "z10";
+  return CLANG_SYSTEMZ_DEFAULT_ARCH;
 }
 
 void systemz::getSystemZTargetFeatures(const ArgList &Args,