projects / packages / openh264.git / blame
| Commit | Line | Data |
|---|---|---|
| e2571060 JB |
1 | --- openh264-1.7.0/build/platform-linux.mk.orig 2017-07-16 18:29:39.036814547 +0200 |
| 2 | +++ openh264-1.7.0/build/platform-linux.mk 2017-07-16 18:33:08.330145489 +0200 | |
| 3 | @@ -9,7 +9,11 @@ | |
| 4 | AR_OPTS = crD $@ | |
| 3c5f0148 | 5 | ifeq ($(ASM_ARCH), x86) |
| e2571060 | 6 | ifeq ($(ARCH), x86_64) |
| 3c5f0148 JR |
7 | +ifeq ($(IS_X32), Yes) |
| 8 | +ASMFLAGS += -f elfx32 | |
| 9 | +else | |
| 10 | ASMFLAGS += -f elf64 | |
| 11 | +endif | |
| 12 | else | |
| 13 | ASMFLAGS += -f elf | |
| 14 | endif | |
| 15 | --- openh264-1.4.0/codec/common/x86/asm_inc.asm~ 2015-03-05 10:25:12.000000000 +0100 | |
| 16 | +++ openh264-1.4.0/codec/common/x86/asm_inc.asm 2015-04-26 11:58:16.516975386 +0200 | |
| 17 | @@ -122,6 +122,10 @@ | |
| 18 | SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-executable | |
| 19 | %endif | |
| 20 | ||
| 21 | +%ifidn __OUTPUT_FORMAT__,elfx32 | |
| 22 | +SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-executable | |
| 23 | +%endif | |
| 24 | + | |
| 25 | %define arg1 rdi | |
| 26 | %define arg2 rsi | |
| 27 | %define arg3 rdx |