35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
Drop Intel build system specific ifdefs (INTEL_CET_ENABLED and AS_FEATURE_LEVEL) since
|
||
|
|
they do not exist in the RHEL build system.
|
||
|
|
|
||
|
|
While we have __CET__ for cf-protection-enabled builds, we cannot pass it to "nasm" as it
|
||
|
|
is noted by the "--cf-protection" token in CFLAGS. So enable cf-protection for assembly
|
||
|
|
files unconditionally.
|
||
|
|
|
||
|
|
--- ./quickassist/lookaside/access_layer/src/common/compression/reg_sizes.asm.orig 2024-06-29 16:01:35.806838838 +0200
|
||
|
|
+++ ./quickassist/lookaside/access_layer/src/common/compression/reg_sizes.asm 2024-06-29 16:03:38.883926951 +0200
|
||
|
|
@@ -195,20 +195,16 @@
|
||
|
|
|
||
|
|
%define XWORD(reg) reg %+ x
|
||
|
|
|
||
|
|
-%ifdef INTEL_CET_ENABLED
|
||
|
|
- %ifdef __NASM_VER__
|
||
|
|
- %if AS_FEATURE_LEVEL >= 10
|
||
|
|
- %ifidn __OUTPUT_FORMAT__,elf32
|
||
|
|
+%ifdef __NASM_VER__
|
||
|
|
+ %ifidn __OUTPUT_FORMAT__,elf32
|
||
|
|
section .note.gnu.property note alloc noexec align=4
|
||
|
|
DD 0x00000004,0x0000000c,0x00000005,0x00554e47
|
||
|
|
DD 0xc0000002,0x00000004,0x00000003
|
||
|
|
- %endif
|
||
|
|
- %ifidn __OUTPUT_FORMAT__,elf64
|
||
|
|
+ %endif
|
||
|
|
+ %ifidn __OUTPUT_FORMAT__,elf64
|
||
|
|
section .note.gnu.property note alloc noexec align=8
|
||
|
|
DD 0x00000004,0x00000010,0x00000005,0x00554e47
|
||
|
|
DD 0xc0000002,0x00000004,0x00000003,0x00000000
|
||
|
|
- %endif
|
||
|
|
- %endif
|
||
|
|
%endif
|
||
|
|
%endif
|
||
|
|
|