d5a9a4c461
add patch to set default DWARF version to 4 Signed-off-by: liyunfei <liyunfei33@huawei.com>
122 lines
5.4 KiB
Diff
122 lines
5.4 KiB
Diff
From a6925b9f000008d3c1d34a401f6dcaac6e57fbbb Mon Sep 17 00:00:00 2001
|
|
From: liyunfei <liyunfei33@huawei.com>
|
|
Date: Wed, 5 Jul 2023 10:55:14 +0800
|
|
Subject: Revert "Clang: Change the default DWARF version to 5"
|
|
|
|
This reverts commit d3b26dea16108c427b19b5480c9edc76edf8f5b4.
|
|
---
|
|
clang/lib/Driver/ToolChain.cpp | 2 +-
|
|
clang/test/CodeGen/dwarf-version.c | 4 ++--
|
|
clang/test/Driver/as-options.s | 2 +-
|
|
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, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
|
|
index f20ab164531b..53c86ee82936 100644
|
|
--- a/clang/lib/Driver/ToolChain.cpp
|
|
+++ b/clang/lib/Driver/ToolChain.cpp
|
|
@@ -430,7 +430,7 @@ public:
|
|
unsigned ToolChain::GetDefaultDwarfVersion() const {
|
|
// TODO: Remove the RISC-V special case when R_RISCV_SET_ULEB128 linker
|
|
// support becomes more widely available.
|
|
- return getTriple().isRISCV() ? 4 : 5;
|
|
+ return getTriple().isRISCV() ? 4 : 4;
|
|
}
|
|
|
|
Tool *ToolChain::getClang() const {
|
|
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 a2e350a0a835..b6159e111052 100644
|
|
--- a/clang/test/Driver/as-options.s
|
|
+++ b/clang/test/Driver/as-options.s
|
|
@@ -125,7 +125,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 | \
|
|
@@ -144,7 +144,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 a2e350a0a835..b6159e111052 100644
|
|
--- a/clang/test/Driver/cl-options.c
|
|
+++ b/clang/test/Driver/cl-options.c
|
|
@@ -570,7 +570,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.28.0.windows.1
|
|
|