From cf85f36d62a484235e4c5565761a2e53e3f2883e Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 10 Mar 2020 12:26:39 +0000 Subject: [PATCH] [PATCH] systemz: allow configuring default SYSTEMZ_DEFAULT_ARCH. Signed-off-by: Dimitri John Ledkov Gbp-Pq: Name 0001-systemz-allow-configuring-default-SYSTEMZ_DEFAULT_AR.patch --- 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 dc1413f4b..c594cd924 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 2b77d59fd..37926155f 100644 --- 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, -- 2.30.2