b3669793eb
This is also a squashed merge commit from upstream-snapshot (commit ID
13b971d3fcbf82d2) into rawhide whose most important commits from
upstream-snapshot are:
Konrad Kleine (57):
Prepare for snapshot build
Fix patches by using them from the streamline branch
Fixed E: specfile-error error: line 491: Unclosed %if
Fix error: Bad file: /var/lib/copr-rpmbuild/workspace/workdir-0qjlioil/srcdir/0007-cmake-Allow-shared-li
braries-to-customize-the-soname.patch: No such file or directory
Must have forgotten this newly added 'clang_version' global
Disable LTO for anything older than Fedora 34
Add recommonmark to build deps
Use new llvm_snashot_changelog_entry macro
Use llvm_snapshot_version_suffix
Fix RPM packaging bug:
Default to DWARFv4
Revert "Default to DWARFv4"
Compile with DWARFv4
Merge remote-tracking branch 'upstream/rawhide' into upstream-snapshot
Try to address https://reviews.llvm.org/D119199
Update patches
Fixup patches
Patches rebased
Separate clang-tools-extra patches
Try to fix clang build
Rebased patches to fix issue with patch
Make %autopatch verbose
Also rename patch tag
Avoid ld error
Rebased patches
Rebased clang patches
Rebased clang-tools-extra patches
First try to default to DWARF4 by default
Produce DWARF4 by default
Added pgo_instrumented_build conditional
Make clang use the llvm-snapshot-builder
Use %{llvm_snapshot_extra_source_tags} macro
Fix %changelog not in descending chronological order
Rebase patches
Bring back clang
Rebased patches and added third-party and cmake sources
Adjust to https://reviews.llvm.org/D130586
Disable LTO
Manually apply https://reviews.llvm.org/D141581
adjust /lib/ to /%{_lib}/
Remove third party stuff and use gtest patch
Rebased D138472
Trace configure output
Rebase D138472
Assist find_package(LLVMGTest by setting hint dir to LLVM_CMAKE_DIR
Merge remote-tracking branch 'origin/rawhide' into upstream-snapshot
Add back 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
Fixup 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
Rebased 0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
Rebased 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
Dropping 0001-Take-into-account-Fedora-Specific-install-dir-for-li.patch
D142506 landed already
Fix for the IEEE 128-bit fp error
Fix RPM install of includes
Merge remote-tracking branch 'origin/rawhide' into upstream-snapshot
Remove already landed patches D141581 and D143736
Rebase 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
Nikita Popov (7):
Rebase downstream patches
Rebase clang-tools-extra patches
Add clang-offload-packager to clang_tools_binaries
Rebase downstream patches
Rebase LLVMHello patch
Remove fno-openmp-implicit-rpath patches
Restore fno-openmp-implicit-rpath patches
Tom Stellard (25):
Revert patches that added LLVMHello dependency to clang-tools-extra tests
Remove accidentally committed changes from previous commit
Add clang-linker-wrapper and clang-pseudo binaries
Add test for building an rpm with -fopenmp
Add a smaller patch for fixing clang-tools-extra standalone build
Update test name
Add link to upstream patch for clang-tools-extra
Update DWARF-4 patch to fix a test failure
Rebase patch
Emit DWARF4 by default
Fix test after switch to DWARF4 default
Fix dwarf test again
Add workaround for build failure on i386/f36
Remove accidentally committed change
Add back -fno-openmp-implicit-rpath option
Fix patch
Remove patch that was committed upstream
Update -fno-openmp-implicit-rpath patches
Drop openmp changes from patch
Add fix for test failures on AArch64/f38+rawhide
Revert "Add fix for test failures on AArch64/f38+rawhide"
Update OpenMP rpath patch
copr: Install llvm-snapshot-builder from the local COPR project
Remove %clang_resource_dir_readonly macro
Move clang-resource-dir to /usr/lib
sergesanspaille (5):
Rebased clang-tools-extra patches
Rebased clang-tools-extra patches
rebase downstream patches
Rebase downstream patches
Rebase downstream patch
124 lines
5.6 KiB
Diff
124 lines
5.6 KiB
Diff
From 45a9482fad2db1ff39a2bfceba00d42ea8c7b9c9 Mon Sep 17 00:00:00 2001
|
|
From: Konrad Kleine <kkleine@redhat.com>
|
|
Date: Thu, 24 Mar 2022 09:44:21 +0100
|
|
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 989e631a187e..8761a8be103b 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 d307eb3f101f..e7e93bf6688c 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.31.1
|
|
|