Commit d6bb9314467c6e0683156559d23ca341c43fa3c8
2013-11-30T02:04:22
Darwin/aarch64: Use CNAME refs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
index 1022454..542a5ce 100644
--- a/src/aarch64/sysv.S
+++ b/src/aarch64/sysv.S
@@ -23,15 +23,25 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include <fficonfig.h>
#include <ffi.h>
+#ifdef HAVE_MACHINE_ASM_H
+#include <machine/asm.h>
+#else
+#ifdef __USER_LABEL_PREFIX__
+#define CONCAT1(a, b) CONCAT2(a, b)
+#define CONCAT2(a, b) a ## b
+
+/* Use the right prefix for global labels. */
+#define CNAME(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
+#else
+#define CNAME(x) x
+#endif
+#endif
+
#define cfi_adjust_cfa_offset(off) .cfi_adjust_cfa_offset off
#define cfi_rel_offset(reg, off) .cfi_rel_offset reg, off
#define cfi_restore(reg) .cfi_restore reg
#define cfi_def_cfa_register(reg) .cfi_def_cfa_register reg
- .text
- .globl ffi_call_SYSV
- .type ffi_call_SYSV, #function
-
/* ffi_call_SYSV()
Create a stack frame, setup an argument context, call the callee
@@ -81,8 +91,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#define ffi_call_SYSV_FS (8 * 4)
+ .text
+ .globl CNAME(ffi_call_SYSV)
+#ifdef __ELF__
+ .type CNAME(ffi_call_SYSV), #function
+#endif
.cfi_startproc
-ffi_call_SYSV:
+CNAME(ffi_call_SYSV):
stp x29, x30, [sp, #-16]!
cfi_adjust_cfa_offset (16)
cfi_rel_offset (x29, 0)
@@ -221,10 +236,10 @@ ffi_call_SYSV:
Voila! */
- .text
- .globl ffi_closure_SYSV
+ .text
+ .globl CNAME(ffi_closure_SYSV)
.cfi_startproc
-ffi_closure_SYSV:
+CNAME(ffi_closure_SYSV):
stp x29, x30, [sp, #-16]!
cfi_adjust_cfa_offset (16)
cfi_rel_offset (x29, 0)
@@ -270,7 +285,7 @@ ffi_closure_SYSV:
trampoline was called. */
add x2, x29, #16
- bl ffi_closure_SYSV_inner
+ bl CNAME(ffi_closure_SYSV_inner)
/* Figure out if we should touch the vector registers. */
ldr x0, [x22, #8]
@@ -304,4 +319,4 @@ ffi_closure_SYSV:
ret
.cfi_endproc
- .size ffi_closure_SYSV, .-ffi_closure_SYSV
+ .size CNAME(ffi_closure_SYSV), .-CNAME(ffi_closure_SYSV)