pixman: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.d/02-build.yml             |    1 -
 .gitlab-ci.d/03-test.yml              |    1 -
 neon-test.S                           |    2 +-
 pixman/pixman-arm-neon-asm-bilinear.S |    2 +-
 pixman/pixman-arm-neon-asm.S          |    2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit aafb4caea2f440c8ca9fad2cfa2c2fb9e2779ae6
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 22 15:24:22 2025 -0500

    ci: Enable LLVM testing on linux-arm-v7
    
    Fixes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/113

diff --git a/.gitlab-ci.d/02-build.yml b/.gitlab-ci.d/02-build.yml
index c6a7a9a..20eadc5 100644
--- a/.gitlab-ci.d/02-build.yml
+++ b/.gitlab-ci.d/02-build.yml
@@ -31,7 +31,6 @@ include:
   - local: .gitlab-ci.d/templates/build.yml
     inputs:
       target: linux-arm-v7
-      toolchain: [gnu]  # TODO: https://gitlab.freedesktop.org/pixman/pixman/-/issues/113
       qemu_cpu: max
       runner_tag: kvm-aarch64
       docker_job: docker:kvm-aarch64
diff --git a/.gitlab-ci.d/03-test.yml b/.gitlab-ci.d/03-test.yml
index 120c797..23ec7ee 100644
--- a/.gitlab-ci.d/03-test.yml
+++ b/.gitlab-ci.d/03-test.yml
@@ -46,7 +46,6 @@ include:
   - local: .gitlab-ci.d/templates/test.yml
     inputs:
       target: linux-arm-v7
-      toolchain: [gnu]  # TODO: https://gitlab.freedesktop.org/pixman/pixman/-/issues/113
       qemu_cpu: [max]
       runner_tag: kvm-aarch64
       docker_job: docker:kvm-aarch64
commit aecbda94ba417daac21a5fed179d3f773cacca89
Author: Mike Hommey <mh at glandium.org>
Date:   Wed Jan 22 16:03:57 2025 +0900

    arm: Move the .fpu neon directive around
    
    clang's integrated assembler doesn't handle .fpu coming before .arch
    like GNU as does. With .fpu after .arch, neon support can be detected
    and used properly.
    
    Fixes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/113

diff --git a/neon-test.S b/neon-test.S
index c30a399..675bd07 100644
--- a/neon-test.S
+++ b/neon-test.S
@@ -1,7 +1,7 @@
 .text
-.fpu neon
 .arch armv7a
 .object_arch armv4
+.fpu neon
 .eabi_attribute 10, 0
 .arm
 .altmacro
diff --git a/pixman/pixman-arm-neon-asm-bilinear.S b/pixman/pixman-arm-neon-asm-bilinear.S
index 6bd2736..cd33bab 100644
--- a/pixman/pixman-arm-neon-asm-bilinear.S
+++ b/pixman/pixman-arm-neon-asm-bilinear.S
@@ -55,9 +55,9 @@
 #endif
 
 .text
-.fpu neon
 .arch armv7a
 .object_arch armv4
+.fpu neon
 .eabi_attribute 10, 0
 .eabi_attribute 12, 0
 .arm
diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
index 0e09257..c04b335 100644
--- a/pixman/pixman-arm-neon-asm.S
+++ b/pixman/pixman-arm-neon-asm.S
@@ -40,9 +40,9 @@
 #endif
 
     .text
-    .fpu neon
     .arch armv7a
     .object_arch armv4
+    .fpu neon
     .eabi_attribute 10, 0 /* suppress Tag_FP_arch */
     .eabi_attribute 12, 0 /* suppress Tag_Advanced_SIMD_arch */
     .arm