From 30d40ddba9545e4098702ceb7b19442a4a352be3 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sat, 29 Mar 2025 23:14:23 -0700
Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.compiler-rt:
 organize patches

---
 .../compilers/llvm/common/compiler-rt/default.nix  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 8940966a4b35..a619e0b69d0f 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -75,6 +75,11 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optional (lib.versionOlder release_version "15") (getVersionFile "compiler-rt/codesign.patch") # Revert compiler-rt commit that makes codesign mandatory
     ++ [
       (getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config
+      # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
+      # extra `/`.
+      (getVersionFile "compiler-rt/normalize-var.patch")
+      # Fix build on armv6l
+      ./armv6-no-ldrexd-strexd.patch
     ]
     ++ lib.optional (lib.versions.major release_version == "12") (fetchpatch {
       # fixes the parallel build on aarch64 darwin
@@ -95,11 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
           stripLen = 1;
           hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";
         })
-    ++ [
-      # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
-      # extra `/`.
-      (getVersionFile "compiler-rt/normalize-var.patch")
-    ]
     ++
       lib.optional (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")
         # Prevent a compilation error on darwin
@@ -126,10 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
           # Fix build on armv6l
           ./armv6-scudo-no-yield.patch
         ]
-    ++ [
-      # Fix build on armv6l
-      ./armv6-no-ldrexd-strexd.patch
-    ]
     ++ lib.optionals (lib.versionAtLeast release_version "13") [
       (getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")
     ]