From 04b600fe3bac81a92dbc5f180a6127ace270cd1d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 5 Dec 2023 07:41:52 +0100
Subject: [PATCH] Revert "  * Set the cpu defaults for the ARM32
 architectures:" for causing this issue:
 https://lore.kernel.org/lkml/20231204225148.GA2094126@dev-arch.thelio-3990X/T/

This reverts commit 97633b6d51ebc8579c5dbecd12a02fb933620620.
---
 debian/changelog                   | 10 ++++++++++
 debian/patches/arm32-defaults.diff | 18 ------------------
 debian/patches/series              |  1 -
 3 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 debian/patches/arm32-defaults.diff

diff --git a/debian/changelog b/debian/changelog
index 54ffe469..e4cd45c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
+<<<<<<<
   [ Gianfranco Costamagna ]
   * Add new cmake-clang-test to spot issues such as
     Debian bug #1057151
@@ -11,6 +12,15 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
     - armel: arm9e. Closes: #1056115.
     - armhf: cortex-a7.
   * libclang1-17: Hard-code the last full versions for the symlinks.
+=======
+  [ Gianfranco Costamagna ]
+  * Add new cmake-clang-test to spot issues such as
+    Debian bug #1057151
+  * Fix cmake file (Closes: #1057151)
+
+  [ Matthias Klose ]
+  * Also use the free swap to determine the number of parallel processes.
+>>>>>>>
 
  -- 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
deleted file mode 100644
index fc077b65..00000000
--- a/debian/patches/arm32-defaults.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/llvm/lib/TargetParser/ARMTargetParser.cpp
-+++ b/llvm/lib/TargetParser/ARMTargetParser.cpp
-@@ -558,6 +558,15 @@
-     if (MArch == "v7k")
-       return "cortex-a7";
-     break;
-+  case llvm::Triple::Linux:
-+    switch (Triple.getEnvironment()) {
-+    case llvm::Triple::GNUEABI:
-+      return "arm9e"; // armv5te
-+    case llvm::Triple::GNUEABIHF:
-+      return "cortex-a7"; // armv7-a
-+    default:
-+      return "armv5";
-+    }
-   default:
-     break;
-   }
diff --git a/debian/patches/series b/debian/patches/series
index f77e9e6f..20770031 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,4 +151,3 @@ D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
-arm32-defaults.diff