diff --git a/debian/changelog b/debian/changelog
index f4dcf507..27ac99ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Also use the free swap to determine the number of parallel processes.
   * libclang1-17: Hard-code the last full versions for the symlinks.
   * Also use the free swap to determine the number of parallel processes.
+  * Set the cpu defaults for the ARM32 architectures:
+    - armel: arm926ej-s. Closes: #1056115.
+    - armhf: cortex-a8.
+    Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff
new file mode 100644
index 00000000..4a392854
--- /dev/null
+++ b/debian/patches/arm32-defaults.diff
@@ -0,0 +1,14 @@
+--- a/llvm/lib/TargetParser/ARMTargetParser.cpp
++++ b/llvm/lib/TargetParser/ARMTargetParser.cpp
+@@ -590,9 +590,9 @@ StringRef ARM::getARMCPUForArch(const ll
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABIHF:
+     case llvm::Triple::MuslEABIHF:
+-      return "cortex-a7";
++      return "cortex-a8";
+     default:
+-      return "arm7tdmi";
++      return "arm926ej-s";
+     }
+   }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 20770031..f77e9e6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,3 +151,4 @@ D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
+arm32-defaults.diff