diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-12-09 15:28:05 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-12-12 07:19:04 +0000 |
| commit | d729c3459f4472874c8fb53eb2d6039fd503a7d6 (patch) | |
| tree | 3356619229e2c79ff15ffd4a7ac4d89303450d76 /src/3rdparty | |
| parent | a094af001795c9651b299d700a992150d1aba33a (diff) | |
iOS: Enable non-pixman NEON drawhelpers for both 32 and 64-bit
The pixman drawhelpers are implemented using GAS syntax, which the
Clang assembler doesn't handle, nor do they work on 64-bit ARM, so
we disable them selectively. They are only used for 16-bit surfaces
anyways, so it not a big deal on iOS.
(cherry picked from commit 49568df95450733dc4c273945e5ced218132c123)
Change-Id: I70848981c794739d40a6a2d9a537307bc80d61a6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/pixman/pixman-arm-neon-asm.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/pixman/pixman-arm-neon-asm.S b/src/3rdparty/pixman/pixman-arm-neon-asm.S index eb8cc4c966..bd9371eadb 100644 --- a/src/3rdparty/pixman/pixman-arm-neon-asm.S +++ b/src/3rdparty/pixman/pixman-arm-neon-asm.S @@ -34,6 +34,8 @@ * - pixman_composite_over_n_8_0565_asm_neon */ +#if defined(ENABLE_PIXMAN_DRAWHELPERS) + /* Prevent the stack from becoming executable for no reason... */ #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits @@ -1707,3 +1709,5 @@ generate_composite_function \ 0, /* dst_r_basereg */ \ 0, /* src_basereg */ \ 0 /* mask_basereg */ + +#endif
\ No newline at end of file |