SOURCES/0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch

@@ -1,41 +0,0 @@
-From 73d3b4047d757ef35850e2cef38285b96be82f0f Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Tue, 23 May 2023 12:17:29 +0200
-Subject: [PATCH] [Driver] Give devtoolset path precedence over InstalledDir
-
-This is a followup to the change from c5fe10f365247c3dd9416b7ec8bad73a60b5946e.
-While that commit correctly adds the bindir from devtoolset to the
-path, the driver dir / install dir still comes first. This means
-we'll still end up picking /usr/bin/ld rather than the one from
-devtoolset.
-
-Unfortunately, I don't see any way to test this. In the environment
-the tests are run, this would only result in a behavior difference
-if there is an ld binary present in the LLVM build directory, which
-isn't the case.
-
-Differential Revision: https://reviews.llvm.org/D151203
----
- clang/lib/Driver/ToolChains/Linux.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 853ff99d9fe5..aecabb46d4b9 100644
---- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -244,9 +244,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
-     // With devtoolset on RHEL, we want to add a bin directory that is relative
-     // to the detected gcc install, because if we are using devtoolset gcc then
-     // we want to use other tools from devtoolset (e.g. ld) instead of the
--    // standard system tools.
--    PPaths.push_back(Twine(GCCInstallation.getParentLibPath() +
--                     "/../bin").str());
-+    // standard system tools. This should take precedence over InstalledDir.
-+    PPaths.insert(PPaths.begin(),
-+                  Twine(GCCInstallation.getParentLibPath() + "/../bin").str());
- 
-   if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb)
-     ExtraOpts.push_back("-X");
--- 
-2.40.1
-

SOURCES/0001-Produce-DWARF4-by-default.patch

@@ -1,126 +0,0 @@
-From 8ce0e2a14ba0743c06b543c0503203a56c905e8c Mon Sep 17 00:00:00 2001
-From: Konrad Kleine <kkleine@redhat.com>
-Date: Tue, 4 Jun 2024 14:11:23 +0200
-Subject: Produce DWARF4 by default
-
----
- clang/lib/Driver/ToolChain.cpp     | 4 +---
- clang/test/CodeGen/dwarf-version.c | 8 ++++----
- 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, 11 insertions(+), 13 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index 388030592b48..6542895cf857 100644
---- a/clang/lib/Driver/ToolChain.cpp
-+++ b/clang/lib/Driver/ToolChain.cpp
-@@ -428,9 +428,7 @@ ToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const {
- }
- 
- 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 4;
- }
- 
- Tool *ToolChain::getClang() const {
-diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
-index e63316ace69c..3d68b06c58ff 100644
---- a/clang/test/CodeGen/dwarf-version.c
-+++ b/clang/test/CodeGen/dwarf-version.c
-@@ -2,10 +2,10 @@
- // 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=i386-pc-solaris -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
--// RUN: %clang --target=i386-pc-solaris -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
-+// RUN: %clang --target=i386-pc-solaris -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
-+// RUN: %clang --target=i386-pc-solaris -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 5b6dfe308a76..4da65272a1b0 100644
---- a/clang/test/Driver/cl-options.c
-+++ b/clang/test/Driver/cl-options.c
-@@ -571,7 +571,7 @@
- // RUN: %clang_cl -gdwarf /Z7 /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
- // Z7_gdwarf-NOT: "-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 b73602a155b0..b0cf64674253 100644
---- a/clang/test/Driver/clang-g-opts.c
-+++ b/clang/test/Driver/clang-g-opts.c
-@@ -36,7 +36,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-DWARF4: "-dwarf-version=4"
- // CHECK-WITH-G-DWARF2: "-dwarf-version=2"
- 
-diff --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
-index 078341eb1202..6ccbef6a0c36 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 cd48dd792f85..f77781d4c6fa 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.45.1
-

SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch

@@ -4,7 +4,6 @@ Date: Tue, 24 Jan 2023 22:46:25 +0000
 Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional
 
 This fixes clang + clang-tools-extra standalone build after
-36892727e4f19a60778e371d78f8fb09d8122c85.
 ---
  clang-tools-extra/test/CMakeLists.txt                  | 10 +++++++++-
  clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp |  2 +-

SOURCES/clang.cfg

@@ -0,0 +1,3 @@
+# Drop the following option after debugedit adds support to DWARF-5:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
+-gdwarf-4 -g0