diff --git a/0001-Produce-DWARF4-by-default.patch b/0001-Produce-DWARF4-by-default.patch
index 49f7878..ea2d71e 100644
--- a/0001-Produce-DWARF4-by-default.patch
+++ b/0001-Produce-DWARF4-by-default.patch
@@ -1,4 +1,4 @@
-From 698581c0373a42ee900103bb829115094e2ac2bc Mon Sep 17 00:00:00 2001
+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
@@ -9,12 +9,12 @@ 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/as-options.s         | 2 +-
+ 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, 8 insertions(+), 8 deletions(-)
+ 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
@@ -45,7 +45,7 @@ index d307eb3f101f..e7e93bf6688c 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/as-options.s b/clang/test/Driver/as-options.s
-index 73d002c7ef7e..400d4263d256 100644
+index 73d002c7ef7e..71d55f7fd537 100644
 --- a/clang/test/Driver/as-options.s
 +++ b/clang/test/Driver/as-options.s
 @@ -122,7 +122,7 @@
@@ -57,6 +57,15 @@ index 73d002c7ef7e..400d4263d256 100644
  // 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