From 49568df95450733dc4c273945e5ced218132c123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 9 Dec 2015 15:28:05 +0100 Subject: 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. Change-Id: I78417fabd7f671f9c5d94b6e5fa5ce10d3fc1d27 Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty/pixman/pixman-arm-neon-asm.S | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/3rdparty/pixman') 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 -- cgit v1.2.3