projects / packages / xrdp.git / blame
| Commit | Line | Data |
|---|---|---|
| 1c80cffa JR |
1 | --- xrdp-0.9.8/librfxcodec/m4/nasm.m4~ 2017-03-14 03:31:16.000000000 +0100 |
| 2 | +++ xrdp-0.9.8/librfxcodec/m4/nasm.m4 2018-10-22 23:14:49.068774820 +0200 | |
| 3 | @@ -30,6 +30,9 @@ | |
| 4 | linux*aout*) | |
| 5 | objfmt='a.out' | |
| 6 | ;; | |
| 7 | + linux-gnux32) | |
| 8 | + objfmt='ELFX32' | |
| 9 | + ;; | |
| 10 | linux*) | |
| 11 | case "$host_cpu" in | |
| 12 | x86_64) | |
| 13 | @@ -95,6 +98,7 @@ | |
| 14 | BSD-a.out) NAFLAGS='-faoutb -DAOUT';; | |
| 15 | ELF) NAFLAGS='-felf -DELF';; | |
| 16 | ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; | |
| 17 | + ELFX32) NAFLAGS='-felfx32 -DELF -D__x86_64__';; | |
| 18 | RDF) NAFLAGS='-frdf -DRDF';; | |
| 19 | Mach-O) NAFLAGS='-fmacho -DMACHO';; | |
| 20 | Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__';; | |
| 21 | --- xrdp-0.9.8/librfxcodec/src/nasm_lt.sh~ 2017-03-14 03:31:16.000000000 +0100 | |
| 22 | +++ xrdp-0.9.8/librfxcodec/src/nasm_lt.sh 2018-10-22 23:15:27.400841584 +0200 | |
| 23 | @@ -11,7 +11,7 @@ | |
| 24 | pic=yes | |
| 25 | fi | |
| 26 | ;; | |
| 27 | - -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \ | |
| 28 | + -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \ | |
| 29 | -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64) | |
| 30 | # it's a file format specifier for nasm. | |
| 31 | command="$command $1" | |
| 32 | --- xrdp-0.9.8/librfxcodec/src/common.asm~ 2017-09-26 08:22:51.000000000 +0200 | |
| 33 | +++ xrdp-0.9.8/librfxcodec/src/common.asm 2018-10-22 23:48:37.178222237 +0200 | |
| 34 | @@ -34,6 +34,10 @@ | |
| 35 | %define is_elf 1 | |
| 36 | %endif | |
| 37 | ||
| 38 | +%ifidn __OUTPUT_FORMAT__,elfx32 | |
| 39 | +%define is_elf 1 | |
| 40 | +%endif | |
| 41 | + | |
| 42 | ; Detect Mach-O formats | |
| 43 | %ifidn __OUTPUT_FORMAT__,macho | |
| 44 | %define is_macho 1 |