From a377be6eb6555b2cbe64276c16901ac4a972731a Mon Sep 17 00:00:00 2001 From: Scott Linder Date: Fri, 29 Mar 2019 17:45:40 +0000 Subject: [PATCH] [AMDGPU] Switch default DWARF version to 5 Effectively reverts r337612. The issues that cropped up with the last attempt appear to have gone away. Differential Revision: https://reviews.llvm.org/D59008 llvm-svn: 357285 --- clang/lib/Driver/ToolChains/AMDGPU.h | 2 +- clang/test/Driver/amdgpu-toolchain.c | 2 +- clang/test/Driver/split-debug.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/AMDGPU.h b/clang/lib/Driver/ToolChains/AMDGPU.h index 97f7d54..b39edda 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.h +++ b/clang/lib/Driver/ToolChains/AMDGPU.h @@ -55,7 +55,7 @@ protected: public: AMDGPUToolChain(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args); - unsigned GetDefaultDwarfVersion() const override { return 2; } + unsigned GetDefaultDwarfVersion() const override { return 5; } bool IsIntegratedAssemblerDefault() const override { return true; } llvm::opt::DerivedArgList * TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch, diff --git a/clang/test/Driver/amdgpu-toolchain.c b/clang/test/Driver/amdgpu-toolchain.c index 52a7197..bd6bf7e 100644 --- a/clang/test/Driver/amdgpu-toolchain.c +++ b/clang/test/Driver/amdgpu-toolchain.c @@ -3,4 +3,4 @@ // AS_LINK: ld.lld{{.*}} "-shared" // RUN: %clang -### -g -target amdgcn--amdhsa -mcpu=kaveri %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s -// DWARF_VER: "-dwarf-version=2" +// DWARF_VER: "-dwarf-version=5" diff --git a/clang/test/Driver/split-debug.c b/clang/test/Driver/split-debug.c index 47afb1a..4a2f05e 100644 --- a/clang/test/Driver/split-debug.c +++ b/clang/test/Driver/split-debug.c @@ -38,6 +38,9 @@ // RUN: %clang -target x86_64-pc-freebsd12 -gsplit-dwarf -c -### %s 2> %t // RUN: FileCheck -check-prefix=CHECK-OPTION < %t %s // +// RUN: %clang -target amdgcn-amd-amdhsa -gsplit-dwarf -c -### %s 2> %t +// RUN: FileCheck -check-prefix=CHECK-OPTION < %t %s +// // CHECK-OPTION: "-split-dwarf-file" "split-debug.dwo" // RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -S -### %s 2> %t -- 2.7.4