PR#169: Copy CFLAGS to ASMFLAGs to enable CET in asm files - rpms/llvm

rpms / llvm

#169 Copy CFLAGS to ASMFLAGs to enable CET in asm files

Merged 4 months ago by nikic. Opened 4 months ago by nikic.

rpms/ nikic/llvm f37-cet into f37

Copy CFLAGS to ASMFLAGs to enable CET in asm files

Nikita Popov • 4 months ago

8f088ec

llvm.spec

file modified

+7 -1

		`@@ -72,7 +72,7 @@`

		`Name: %{pkg_name}`
		`Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: The Low Level Virtual Machine`

		`License: NCSA`
		`@@ -237,6 +237,9 @@`
		`%global optflags %(echo %{optflags} \| sed 's/-g /-g1 /')`
		`%endif`

		`+ # Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.`
		`+ export ASMFLAGS=$CFLAGS`
		`+`
		`# force off shared libs as cmake macros turns it on.`
		`%cmake -G Ninja \`
		`-DBUILD_SHARED_LIBS:BOOL=OFF \`
		`@@ -565,6 +568,9 @@`
		`%endif`

		`%changelog`
		`+ * Tue Apr 18 2023 Nikita Popov <npopov@redhat.com> - 15.0.7-2`
		`+ - Copy CFLAGS to ASMFLAGs to enable CET in asm files`
		`+`
		`* Thu Jan 12 2023 Nikita Popov <npopov@redhat.com> - 15.0.7-1`
		`- Update to LLVM 15.0.7`

nikic commented 4 months ago

Backport from f38 for https://bugzilla.redhat.com/show_bug.cgi?id=2187553.

zuul commented 4 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/2178a6b907b74b0cac7d8b6b59e8ce51

check-for-arches : SUCCESS in 2m 16s
rpm-scratch-build : SUCCESS in 2h 01m 51s
rpm-scratch-build-s390x : SUCCESS in 1h 42m 11s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 2h 19m 18s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 1h 48m 52s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 3h 41m 14s (non-voting)
rpm-linter : FAILURE in 13m 45s (non-voting)
rpm-rpminspect : TIMED_OUT in 31m 24s (non-voting)
check-for-sti-tests : SUCCESS in 20s
check-for-fmf-tests : SUCCESS in 18s
rpm-install-test : SUCCESS in 2m 34s
rpm-tmt-test : SUCCESS in 8m 42s
Skipped 1 job

tuliom commented 4 months ago

LGTM

nikic commented 4 months ago

Verified that IBT, SHSTK properties are present in libLLVM-15.so:

$ readelf --notes usr/lib64/libLLVM-15.so 

Displaying notes found in: .note.gnu.property
  Owner                Data size    Description
  GNU                  0x00000010   NT_GNU_PROPERTY_TYPE_0
      Properties: x86 feature: IBT, SHSTK

Pull-Request has been merged by nikic

4 months ago