From 46ae902cffe5845f5876bda2858b24cb4bc4490a Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 9 Sep 2016 21:10:35 +0000 Subject: [PATCH] Debug info: Bump the default DWARF version on Darwin to 4. This is a spiritual re-commit of r201375 with only a brief delay for upgrading the green dragon builders. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@281094 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.h | 2 +- test/CodeGen/dwarf-version.c | 2 +- test/Driver/clang-g-opts.c | 7 +++++-- test/Driver/debug-options.c | 12 ++++++++---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index a0dcbf65f9..234a6033de 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -585,7 +585,7 @@ public: void AddLinkARCArgs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const override; - unsigned GetDefaultDwarfVersion() const override { return 2; } + unsigned GetDefaultDwarfVersion() const override { return 4; } // Until dtrace (via CTF) and LLDB can deal with distributed debug info, // Darwin defaults to standalone/full debug info. bool GetDefaultStandaloneDebug() const override { return true; } diff --git a/test/CodeGen/dwarf-version.c b/test/CodeGen/dwarf-version.c index 2171ed6ad9..49c230d536 100644 --- a/test/CodeGen/dwarf-version.c +++ b/test/CodeGen/dwarf-version.c @@ -4,7 +4,7 @@ // RUN: %clang -target x86_64-linux-gnu -gdwarf-5 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5 // RUN: %clang -target x86_64-linux-gnu -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4 // RUN: %clang -target x86_64-linux-gnu -gdwarf -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4 -// RUN: %clang -target x86_64-apple-darwin -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER2 +// RUN: %clang -target x86_64-apple-darwin -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4 // RUN: %clang -target powerpc-unknown-openbsd -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER2 // RUN: %clang -target powerpc-unknown-freebsd -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER2 // RUN: %clang -target i386-pc-solaris -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER2 diff --git a/test/Driver/clang-g-opts.c b/test/Driver/clang-g-opts.c index 32b8d429ea..21b5cf645d 100644 --- a/test/Driver/clang-g-opts.c +++ b/test/Driver/clang-g-opts.c @@ -4,7 +4,7 @@ // Assert that the toolchains which should default to a lower Dwarf version do so. // RUN: %clang -### -S %s -g -target x86_64-apple-darwin 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s +// RUN: | FileCheck --check-prefix=CHECK-WITH-G-STANDALONE %s // RUN: %clang -### -S %s -g -target i686-pc-openbsd 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s // RUN: %clang -### -S %s -g -target x86_64-pc-freebsd10.0 2>&1 \ @@ -22,7 +22,7 @@ // RUN: %clang -### -S %s -g0 -g -target x86_64-linux-gnu 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-WITH-G %s // RUN: %clang -### -S %s -g0 -g -target x86_64-apple-darwin 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s +// RUN: | FileCheck --check-prefix=CHECK-WITH-G-STANDALONE %s // RUN: %clang -### -S %s -g0 -g -target i686-pc-openbsd 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s // RUN: %clang -### -S %s -g0 -g -target x86_64-pc-freebsd10.0 2>&1 \ @@ -34,3 +34,6 @@ // CHECK-WITH-G: "-debug-info-kind=limited" // CHECK-WITH-G: "-dwarf-version=4" // CHECK-WITH-G-DWARF2: "-dwarf-version=2" + +// CHECK-WITH-G-STANDALONE: "-debug-info-kind=standalone" +// CHECK-WITH-G-STANDALONE: "-dwarf-version=4" diff --git a/test/Driver/debug-options.c b/test/Driver/debug-options.c index 0ccacd0fc6..720a48dfdb 100644 --- a/test/Driver/debug-options.c +++ b/test/Driver/debug-options.c @@ -27,7 +27,7 @@ // RUN: %clang -### -c -ggdb %s -target x86_64-apple-darwin 2>&1 \ // RUN: | FileCheck -check-prefix=G_DARWIN -check-prefix=G_GDB %s // RUN: %clang -### -c -ggdb1 %s -target x86_64-apple-darwin 2>&1 \ -// RUN: | FileCheck -check-prefix=GLTO_ONLY_DWARF2 %s +// RUN: | FileCheck -check-prefix=GLTO_ONLY %s // RUN: %clang -### -c -ggdb3 %s -target x86_64-apple-darwin 2>&1 \ // RUN: | FileCheck -check-prefix=G_DARWIN %s @@ -68,7 +68,7 @@ // RUN: %clang -### -c -gline-tables-only %s 2>&1 \ // RUN: | FileCheck -check-prefix=GLTO_ONLY %s // RUN: %clang -### -c -gline-tables-only %s -target x86_64-apple-darwin 2>&1 \ -// RUN: | FileCheck -check-prefix=GLTO_ONLY_DWARF2 %s +// RUN: | FileCheck -check-prefix=GLTO_ONLY %s // RUN: %clang -### -c -gline-tables-only %s -target i686-pc-openbsd 2>&1 \ // RUN: | FileCheck -check-prefix=GLTO_ONLY_DWARF2 %s // RUN: %clang -### -c -gline-tables-only %s -target x86_64-pc-freebsd10.0 2>&1 \ @@ -76,7 +76,7 @@ // RUN: %clang -### -c -gline-tables-only -g %s -target x86_64-linux-gnu 2>&1 \ // RUN: | FileCheck -check-prefix=G_ONLY %s // RUN: %clang -### -c -gline-tables-only -g %s -target x86_64-apple-darwin 2>&1 \ -// RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s +// RUN: | FileCheck -check-prefix=G_STANDALONE_DWARF4 %s // RUN: %clang -### -c -gline-tables-only -g %s -target i686-pc-openbsd 2>&1 \ // RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s // RUN: %clang -### -c -gline-tables-only -g %s -target x86_64-pc-freebsd10.0 2>&1 \ @@ -113,7 +113,7 @@ // G: "-debug-info-kind=limited" // // G_DARWIN: "-cc1" -// G_DARWIN: "-dwarf-version=2" +// G_DARWIN: "-dwarf-version=4" // // NOG_PS4: "-cc1" // NOG_PS4-NOT "-dwarf-version= @@ -150,6 +150,10 @@ // G_ONLY_DWARF2: "-debug-info-kind={{standalone|limited}}" // G_ONLY_DWARF2: "-dwarf-version=2" // +// G_STANDALONE_DWARF4: "-cc1" +// G_STANDALONE_DWARF4: "-debug-info-kind=standalone" +// G_STANDALONE_DWARF4: "-dwarf-version=4" +// // This tests asserts that "-gline-tables-only" "-g0" disables debug info. // GLTO_NO: "-cc1" // GLTO_NO-NOT: -debug-info-kind= -- 2.40.0