summaryrefslogtreecommitdiff
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2014-04-10 06:41:38 (GMT)
committer Søren Sandmann <ssp@redhat.com>2014-04-22 00:38:09 (GMT)
commit5f661ee719be25c3aa0eb0d45e0db23a37e76468 (patch) (side-by-side diff)
tree5262f96ff4b009cfe999ed718b3125b101f396f4
parentab587b444cf9ac1ee421b9942befc509b52cb109 (diff)
downloadpixman-master.zip
pixman-master.tar.gz
ARM: use pixman_asm_function in internal headersHEADmaster
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pixman/pixman-arm-neon-asm.h20
-rw-r--r--pixman/pixman-arm-simd-asm.h9
2 files changed, 5 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.h b/pixman/pixman-arm-simd-asm.h
index 0baf87a..8de060a 100644
--- a/pixman/pixman-arm-simd-asm.h
+++ b/pixman/pixman-arm-simd-asm.h
@@ -596,13 +596,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
@@ -714,7 +708,6 @@
SCRATCH .req r12
ORIG_W .req r14 /* width (pixels) */
-fname:
push {r4-r11, lr} /* save all registers */
subs Y, Y, #1