From: Pekka Paalanen
The two ARM headers contained open-coded copies of pixman_asm_function,
replace these.
Since it seems customary that ARM headers do not use CPP include guards,
rely on the .S files to #include "pixman-arm-asm.h" first. They all
do now.
v2: Fix a build failure on rpi by adding one #include.
---
pixman/pixman-arm-neon-asm.h | 20
pixman/pixman-arm-simd-asm.S | 1 +
pixman/pixman-arm-simd-asm.h | 9 +
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h
index d0d92d7..bdcf6a9 100644
--- a/pixman/pixman-arm-neon-asm.h
+++ b/pixman/pixman-arm-neon-asm.h
@@ -631,14 +631,8 @@ local skip1
src_basereg_ = 0, \
mask_basereg_ = 24
-.func fname
-.global fname
-/* For ELF format also set function visibility to hidden */
-#ifdef __ELF__
-.hidden fname
-.type fname, %function
-#endif
-fname:
+pixman_asm_function fname
+
push{r4-r12, lr}/* save all registers */
/*
@@ -945,14 +939,8 @@ fname:
src_basereg_ = 0, \
mask_basereg_ = 24
-.func fname
-.global fname
-/* For ELF format also set function visibility to hidden */
-#ifdef __ELF__
-.hidden fname
-.type fname, %function
-#endif
-fname:
+pixman_asm_function fname
+
.set PREFETCH_TYPE_CURRENT, PREFETCH_TYPE_NONE
/*
* Make some macro arguments globally visible and accessible
diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S
index dd6f788..a8f508c 100644
--- a/pixman/pixman-arm-simd-asm.S
+++ b/pixman/pixman-arm-simd-asm.S
@@ -37,6 +37,7 @@
.altmacro
.p2align 2
+#include "pixman-arm-asm.h"
#include "pixman-arm-simd-asm.h"
/* A head macro should do all processing which results in an output of up to
diff --git a/pixman/pixman-arm-simd-asm.h b/pixman/pixman-arm-simd-asm.h
index 24b1ad2..1b2c592 100644
--- a/pixman/pixman-arm-simd-asm.h
+++ b/pixman/pixman-arm-simd-asm.h
@@ -561,13 +561,7 @@
process_tail, \
process_inner_loop
- .func fname
- .global fname
- /* For ELF format also set function visibility to hidden */
-#ifdef __ELF__
- .hidden fname
- .type fname, %function
-#endif
+pixman_asm_function fname
/*
* Make some macro arguments globally visible and accessible
@@ -679,7 +673,6 @@
SCRATCH .reqr12
ORIG_W .reqr14 /* width (pixels) */
-fname:
push{r4-r11, lr}/* save all registers */
subsY, Y, #1
--
1.8.3.2
___
Pixman mailing list
Pixman@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pixman