From f42ecdfde7a69b396c6b40d6c37141125e691bb5 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 17 Mar 2025 14:38:17 +0000 Subject: [PATCH 1/2] Fix pixman warnings with android ndks before r22 Versions of clang in these ndks did not pass the correct -march flag to the assembler, see: https://github.com/android/ndk/issues/906 This resulted in warnings such as: ``` /tmp/pixman-radial-gradient-09b366.s: Assembler messages: /tmp/pixman-radial-gradient-09b366.s:391: Rd and Rm should be different in mla /tmp/pixman-radial-gradient-09b366.s:394: Rd and Rm should be different in mla /tmp/pixman-radial-gradient-09b366.s:398: rdhi, rdlo and rm must all be different /tmp/pixman-radial-gradient-09b366.s:403: Rd and Rm should be different in mla /tmp/pixman-radial-gradient-09b366.s:406: rdhi, rdlo and rm must all be different /tmp/pixman-radial-gradient-09b366.s:412: rdhi, rdlo and rm must all be different ``` --- project/lib/pixman-files.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml index 01fb83b21b..98fb8bc44b 100644 --- a/project/lib/pixman-files.xml +++ b/project/lib/pixman-files.xml @@ -7,7 +7,10 @@ - +
+ + +
From 96c140c0ff50211800a4d1d63a1f650375a3a404 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 17 Mar 2025 17:35:08 +0000 Subject: [PATCH 2/2] Adjust condition for pixman clang flag It is necessary due to the pixman assembly files not being compatible with the llvm assembler, and we only compile assembly files if PIXMAN_ARM_NEON is enabled. --- project/lib/pixman-files.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml index 98fb8bc44b..840bc60757 100644 --- a/project/lib/pixman-files.xml +++ b/project/lib/pixman-files.xml @@ -7,8 +7,8 @@ -
- +
+