From 9c9d88d8b1bb6468f6c4258fe41bbcd01f742801 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 30 Mar 2020 14:20:48 +0200 Subject: [PATCH] [SystemZ] Allow configuring default CLANG_SYSTEMZ_ARCH On Ubuntu, we want to raise default CLANG_SYSTEMZ_ARCH to z13, thus allow configuring this via CMake. On Debian, we want to raise it to z196. Author: Dimitri John Ledkov Differential Revision: https://reviews.llvm.org/D75914 --- 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 7809d65..c9e76c5 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 4d87110..b263fb7 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, -- 2.7.4