From dc76251478b0b52f3580b788e39b9b42daa3e6d7 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 29 Mar 2022 23:21:25 +0000
Subject: [PATCH] Update DWARF4 patch to fix Driver/clang-g-opts.c

---
 ...ATCH-clang-Produce-DWARF4-by-default.patch | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/0010-PATCH-clang-Produce-DWARF4-by-default.patch b/0010-PATCH-clang-Produce-DWARF4-by-default.patch
index 410f5bb..22af8ac 100644
--- a/0010-PATCH-clang-Produce-DWARF4-by-default.patch
+++ b/0010-PATCH-clang-Produce-DWARF4-by-default.patch
@@ -1,7 +1,7 @@
-From 6509777d4c12a42c7487814d868375a86712bf5b Mon Sep 17 00:00:00 2001
+From c7fd378862328e3e2c60be76b7a15821ca2d44ab Mon Sep 17 00:00:00 2001
 From: Konrad Kleine <kkleine@redhat.com>
 Date: Thu, 24 Mar 2022 09:44:21 +0100
-Subject: [PATCH][clang]Produce DWARF4 by default
+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:
 
@@ -10,12 +10,13 @@ https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8
  clang/include/clang/Driver/ToolChain.h | 2 +-
  clang/test/CodeGen/dwarf-version.c     | 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 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
+ 6 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
-index adf1753e8d3a..c8adc4d917ce 100644
+index bfc46af00265..a2f4ac85e7d7 100644
 --- a/clang/include/clang/Driver/ToolChain.h
 +++ b/clang/include/clang/Driver/ToolChain.h
 @@ -515,7 +515,7 @@ public:
@@ -43,10 +44,10 @@ index 0a6fa4768026..96f01749d0d8 100644
  // 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/cl-options.c b/clang/test/Driver/cl-options.c
-index f332cd83b26e..911779fffbef 100644
+index 8d240e6e6e5c..1a568e95d349 100644
 --- a/clang/test/Driver/cl-options.c
 +++ b/clang/test/Driver/cl-options.c
-@@ -597,7 +597,7 @@
+@@ -596,7 +596,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"
@@ -55,6 +56,19 @@ index f332cd83b26e..911779fffbef 100644
  
  // RUN: %clang_cl -fmsc-version=1800 -TP -### -- %s 2>&1 | FileCheck -check-prefix=CXX11 %s
  // CXX11: -std=c++11
+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 753dee19fcbf..dfd12cc0bba4 100644
 --- a/clang/test/Driver/ve-toolchain.c
@@ -82,5 +96,5 @@ index 4b2b9c5747fe..3a196dd94ca1 100644
  ///-----------------------------------------------------------------------------
  /// Checking include-path
 -- 
-2.35.1
+2.27.0