diff -Naur a/clang-17.0.6.src/lib/Driver/ToolChain.cpp b/clang-17.0.6.src/lib/Driver/ToolChain.cpp
--- a/clang-17.0.6.src/lib/Driver/ToolChain.cpp	2023-10-31 14:00:30.000000000 +0600
+++ b/clang-17.0.6.src/lib/Driver/ToolChain.cpp	2023-11-21 18:55:06.623219663 +0600
@@ -430,7 +430,7 @@
 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 -Naur a/clang-17.0.6.src/test/CodeGen/dwarf-version.c b/clang-17.0.6.src/test/CodeGen/dwarf-version.c
--- a/clang-17.0.6.src/test/CodeGen/dwarf-version.c	2023-10-31 14:00:30.000000000 +0600
+++ b/clang-17.0.6.src/test/CodeGen/dwarf-version.c	2023-11-21 18:56:20.826701636 +0600
@@ -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 -Naur a/clang-17.0.6.src/test/Driver/as-options.s b/clang-17.0.6.src/test/Driver/as-options.s
--- a/clang-17.0.6.src/test/Driver/as-options.s	2023-10-31 14:00:30.000000000 +0600
+++ b/clang-17.0.6.src/test/Driver/as-options.s	2023-11-21 18:58:28.177814489 +0600
@@ -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 -Naur a/clang-17.0.6.src/test/Driver/clang-g-opts.c b/clang-17.0.6.src/test/Driver/clang-g-opts.c
--- a/clang-17.0.6.src/test/Driver/clang-g-opts.c	2023-10-31 14:00:30.000000000 +0600
+++ b/clang-17.0.6.src/test/Driver/clang-g-opts.c	2023-11-21 19:00:10.034104942 +0600
@@ -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 -Naur a/clang-17.0.6.src/test/Driver/cl-options.c b/clang-17.0.6.src/test/Driver/cl-options.c
--- a/clang-17.0.6.src/test/Driver/cl-options.c	2023-10-31 14:00:30.000000000 +0600
+++ b/clang-17.0.6.src/test/Driver/cl-options.c	2023-11-21 18:59:28.812392099 +0600
@@ -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 -Naur a/clang-17.0.6.src/test/Driver/ve-toolchain.c b/clang-17.0.6.src/test/Driver/ve-toolchain.c
--- a/clang-17.0.6.src/test/Driver/ve-toolchain.c	2023-10-31 14:00:30.000000000 +0600
+++ b/clang-17.0.6.src/test/Driver/ve-toolchain.c	2023-11-21 19:00:46.827848632 +0600
@@ -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