From a6122cd8dc1b10bcba751f851cf5b1751cff165c Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 10 Mar 2020 12:26:39 +0000 Subject: [PATCH] systemz: allow configuring default SYSTEMZ_DEFAULT_ARCH. Signed-off-by: Dimitri John Ledkov --- clang/CMakeLists.txt | 4 ++++ clang/lib/Driver/ToolChains/Arch/SystemZ.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 7809d65291958..c9e76c5e4518f 100644 --- 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 4d871104c95ac..b263fb7df09e8 100644 --- a/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp +++ b/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp @@ -47,7 +47,7 @@ std::string systemz::getSystemZTargetCPU(const ArgList &Args) { return std::string(CPUName); } - return "z10"; + return CLANG_SYSTEMZ_DEFAULT_ARCH; } void systemz::getSystemZTargetFeatures(const Driver &D, const ArgList &Args,