From d6128c4ee52650bf7dd99170907267e4ff514672 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Mon, 12 Sep 2022 15:03:13 +0200
Subject: [PATCH] Make sure asm files are built with -fcf-protection

This should fix the annocheck failure.
---
 llvm-libunwind.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/llvm-libunwind.spec b/llvm-libunwind.spec
index 230fa20..761cbfe 100644
--- a/llvm-libunwind.spec
+++ b/llvm-libunwind.spec
@@ -9,7 +9,7 @@
 
 Name:       llvm-libunwind
 Version:    %{libunwind_version}%{?rc_ver:~rc%{rc_ver}}
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    LLVM libunwind
 
 License:    ASL 2.0 or NCSA or MIT
@@ -65,6 +65,9 @@ Documentation for LLVM libunwind
 %autosetup -n %{libunwind_srcdir} -p2
 
 %build
+# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
+export ASMFLAGS=$CFLAGS
+
 %cmake -GNinja \
     -DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -126,6 +129,9 @@ rm %{buildroot}%{_pkgdocdir}/html/.buildinfo
 %doc %{_pkgdocdir}/html
 
 %changelog
+* Mon Sep 12 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
+- Make sure asm files are built with -fcf-protection
+
 * Fri Sep 09 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
 - Update to LLVM 15.0.0