124 lines
5.6 KiB
Diff
124 lines
5.6 KiB
Diff
From 4ea62faaaac1aad0fe496cabe9674c809c91c49a Mon Sep 17 00:00:00 2001
|
|
From: Konrad Kleine <kkleine@redhat.com>
|
|
Date: Mon, 13 Feb 2023 17:11:00 -0300
|
|
Subject: [PATCH] Produce DWARF4 by default
|
|
|
|
Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream:
|
|
|
|
https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8f5b4?diff=unified
|
|
---
|
|
clang/include/clang/Driver/ToolChain.h | 2 +-
|
|
clang/test/CodeGen/dwarf-version.c | 4 ++--
|
|
clang/test/Driver/as-options.s | 4 ++--
|
|
clang/test/Driver/cl-options.c | 2 +-
|
|
clang/test/Driver/clang-g-opts.c | 2 +-
|
|
clang/test/Driver/ve-toolchain.c | 2 +-
|
|
clang/test/Driver/ve-toolchain.cpp | 2 +-
|
|
7 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
|
|
index f75f35dc9e65..a70ae2b17833 100644
|
|
--- a/clang/include/clang/Driver/ToolChain.h
|
|
+++ b/clang/include/clang/Driver/ToolChain.h
|
|
@@ -547,7 +547,7 @@ public:
|
|
|
|
// Return the DWARF version to emit, in the absence of arguments
|
|
// to the contrary.
|
|
- virtual unsigned GetDefaultDwarfVersion() const { return 5; }
|
|
+ virtual unsigned GetDefaultDwarfVersion() const { return 4; }
|
|
|
|
// Some toolchains may have different restrictions on the DWARF version and
|
|
// may need to adjust it. E.g. NVPTX may need to enforce DWARF2 even when host
|
|
diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
|
|
index 0a6fa4768026..96f01749d0d8 100644
|
|
--- a/clang/test/CodeGen/dwarf-version.c
|
|
+++ b/clang/test/CodeGen/dwarf-version.c
|
|
@@ -2,8 +2,8 @@
|
|
// RUN: %clang -target x86_64-linux-gnu -gdwarf-3 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER3
|
|
// RUN: %clang -target x86_64-linux-gnu -gdwarf-4 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
|
|
// 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=VER5
|
|
-// RUN: %clang -target x86_64-linux-gnu -gdwarf -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
|
|
|
|
// The -isysroot is used as a hack to avoid LIT messing with the SDKROOT
|
|
// environment variable which indirecty overrides the version in the target
|
|
diff --git a/clang/test/Driver/as-options.s b/clang/test/Driver/as-options.s
|
|
index 73d002c7ef7e..71d55f7fd537 100644
|
|
--- a/clang/test/Driver/as-options.s
|
|
+++ b/clang/test/Driver/as-options.s
|
|
@@ -122,7 +122,7 @@
|
|
// RUN: FileCheck --check-prefix=DEBUG %s
|
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -g0 -g %s -### 2>&1 | \
|
|
// RUN: FileCheck --check-prefix=DEBUG %s
|
|
-// DEBUG: "-g" "-gdwarf-5"
|
|
+// DEBUG: "-g" "-gdwarf-4"
|
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -g -g0 %s -### 2>&1 | \
|
|
// RUN: FileCheck --check-prefix=NODEBUG %s
|
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 -g0 %s -### 2>&1 | \
|
|
@@ -141,7 +141,7 @@
|
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-2 %s -### 2>&1 | \
|
|
// RUN: FileCheck --check-prefix=GDWARF2 %s
|
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf %s -### 2>&1 | \
|
|
-// RUN: FileCheck --check-prefix=GDWARF5 %s
|
|
+// RUN: FileCheck --check-prefix=GDWARF4 %s
|
|
|
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 %s -### 2>&1 | \
|
|
// RUN: FileCheck --check-prefix=GDWARF5 %s
|
|
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
|
|
index 1d588bdfc1b0..1ad57aedc3a4 100644
|
|
--- a/clang/test/Driver/cl-options.c
|
|
+++ b/clang/test/Driver/cl-options.c
|
|
@@ -575,7 +575,7 @@
|
|
// RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
|
|
// Z7_gdwarf: "-gcodeview"
|
|
// Z7_gdwarf: "-debug-info-kind=constructor"
|
|
-// Z7_gdwarf: "-dwarf-version=
|
|
+// Z7_gdwarf: "-dwarf-version=4
|
|
|
|
// RUN: %clang_cl /ZH:MD5 /c -### -- %s 2>&1 | FileCheck -check-prefix=ZH_MD5 %s
|
|
// ZH_MD5: "-gsrc-hash=md5"
|
|
diff --git a/clang/test/Driver/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c
|
|
index d982b1070cae..bb129e75769c 100644
|
|
--- a/clang/test/Driver/clang-g-opts.c
|
|
+++ b/clang/test/Driver/clang-g-opts.c
|
|
@@ -32,7 +32,7 @@
|
|
|
|
// CHECK-WITHOUT-G-NOT: -debug-info-kind
|
|
// CHECK-WITH-G: "-debug-info-kind=constructor"
|
|
-// CHECK-WITH-G: "-dwarf-version=5"
|
|
+// CHECK-WITH-G: "-dwarf-version=4"
|
|
// CHECK-WITH-G-DWARF2: "-dwarf-version=2"
|
|
|
|
// CHECK-WITH-G-STANDALONE: "-debug-info-kind=standalone"
|
|
diff --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
|
|
index 32e25769b6da..b8a2852daba8 100644
|
|
--- a/clang/test/Driver/ve-toolchain.c
|
|
+++ b/clang/test/Driver/ve-toolchain.c
|
|
@@ -6,7 +6,7 @@
|
|
/// Checking dwarf-version
|
|
|
|
// RUN: %clang -### -g --target=ve %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s
|
|
-// DWARF_VER: "-dwarf-version=5"
|
|
+// DWARF_VER: "-dwarf-version=4"
|
|
|
|
///-----------------------------------------------------------------------------
|
|
/// Checking include-path
|
|
diff --git a/clang/test/Driver/ve-toolchain.cpp b/clang/test/Driver/ve-toolchain.cpp
|
|
index 5a33d5eceb61..cedf895b36dc 100644
|
|
--- a/clang/test/Driver/ve-toolchain.cpp
|
|
+++ b/clang/test/Driver/ve-toolchain.cpp
|
|
@@ -7,7 +7,7 @@
|
|
|
|
// RUN: %clangxx -### -g --target=ve-unknown-linux-gnu \
|
|
// RUN: %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s
|
|
-// DWARF_VER: "-dwarf-version=5"
|
|
+// DWARF_VER: "-dwarf-version=4"
|
|
|
|
///-----------------------------------------------------------------------------
|
|
/// Checking include-path
|
|
--
|
|
2.39.1
|
|
|