]>
Commit | Line | Data |
---|---|---|
c97ab8dd JB |
1 | --- openh264-2.4.1/build/platform-gnu-chain.mk.orig 2024-01-30 06:56:32.000000000 +0100 |
2 | +++ openh264-2.4.1/build/platform-gnu-chain.mk 2024-02-28 18:05:31.669221886 +0100 | |
3 | @@ -12,9 +12,11 @@ STATIC_LDFLAGS += -lpthread -lm | |
e2571060 | 4 | AR_OPTS = crD $@ |
3c5f0148 | 5 | ifeq ($(ASM_ARCH), x86) |
e2571060 | 6 | ifeq ($(ARCH), x86_64) |
c97ab8dd | 7 | +ifneq ($(IS_X32), Yes) |
3c5f0148 | 8 | ASMFLAGS += -f elf64 |
c97ab8dd JB |
9 | -else ifeq ($(ARCH), x32) |
10 | +else ($(ARCH), x32) | |
11 | ASMFLAGS += -f elfx32 | |
3c5f0148 JR |
12 | +endif |
13 | else | |
14 | ASMFLAGS += -f elf | |
15 | endif | |
16 | --- openh264-1.4.0/codec/common/x86/asm_inc.asm~ 2015-03-05 10:25:12.000000000 +0100 | |
17 | +++ openh264-1.4.0/codec/common/x86/asm_inc.asm 2015-04-26 11:58:16.516975386 +0200 | |
18 | @@ -122,6 +122,10 @@ | |
19 | SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-executable | |
20 | %endif | |
21 | ||
22 | +%ifidn __OUTPUT_FORMAT__,elfx32 | |
23 | +SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-executable | |
24 | +%endif | |
25 | + | |
26 | %define arg1 rdi | |
27 | %define arg2 rsi | |
28 | %define arg3 rdx |