llvmPackages_{13,14,15,16,17}.compiler-rt: reorder cfi_startproc afte…

…r label (#354569)
NixOS · Nov 8, 2024 · 5af8a32 · 5af8a32
2 parents 3f2008c + 7d55530
commit 5af8a32
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
@@ -970,6 +970,15 @@ let
         ++ lib.optional (
           lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"
         ) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch")
+        ++
+          lib.optional
+            (lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18")
+            (fetchpatch {
+              name = "cfi_startproc-after-label.patch";
+              url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";
+              stripLen = 1;
+              hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";
+            })
         ++ [
           # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
           # extra `/`.