Switch to using DEFINE_COMPILERRT_[PRIVATE_]FUNCTION to define function symbols inside .S files.
llvm-svn: 85264
diff --git a/compiler-rt/lib/arm/adddf3vfp.S b/compiler-rt/lib/arm/adddf3vfp.S
index b1f7077..1b49daa 100644
--- a/compiler-rt/lib/arm/adddf3vfp.S
+++ b/compiler-rt/lib/arm/adddf3vfp.S
@@ -15,8 +15,7 @@
// Adds two double precision floating point numbers using the Darwin
// calling convention where double arguments are passsed in GPR pairs
//
- .globl ___adddf3vfp
-___adddf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__adddf3vfp)
fmdrr d6, r0, r1 // move first param from r0/r1 pair into d6
fmdrr d7, r2, r3 // move second param from r2/r3 pair into d7
faddd d6, d6, d7
diff --git a/compiler-rt/lib/arm/addsf3vfp.S b/compiler-rt/lib/arm/addsf3vfp.S
index 4a4a041..292d052 100644
--- a/compiler-rt/lib/arm/addsf3vfp.S
+++ b/compiler-rt/lib/arm/addsf3vfp.S
@@ -15,8 +15,7 @@
// Adds two single precision floating point numbers using the Darwin
// calling convention where single arguments are passsed in GPRs
//
- .globl ___addsf3vfp
-___addsf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__addsf3vfp)
fmsr s14, r0 // move first param from r0 into float register
fmsr s15, r1 // move second param from r1 into float register
fadds s14, s14, s15
diff --git a/compiler-rt/lib/arm/bswapdi2.S b/compiler-rt/lib/arm/bswapdi2.S
index 70c13e6..2a3465b 100644
--- a/compiler-rt/lib/arm/bswapdi2.S
+++ b/compiler-rt/lib/arm/bswapdi2.S
@@ -14,8 +14,7 @@
//
// Reverse all the bytes in a 64-bit integer.
//
- .globl ___bswapdi2
-___bswapdi2:
+DEFINE_COMPILERRT_FUNCTION(__bswapdi2)
rev r2, r1 // reverse bytes in high 32-bits into temp2
rev r3, r0 // reverse bytes in low 32-bit into temp3
mov r0, r2 // set low 32-bits of result to temp2
diff --git a/compiler-rt/lib/arm/bswapsi2.S b/compiler-rt/lib/arm/bswapsi2.S
index 8f0e1d3..dd9faf1 100644
--- a/compiler-rt/lib/arm/bswapsi2.S
+++ b/compiler-rt/lib/arm/bswapsi2.S
@@ -14,7 +14,6 @@
//
// Reverse all the bytes in a 32-bit integer.
//
- .globl ___bswapsi2
-___bswapsi2:
+DEFINE_COMPILERRT_FUNCTION(__bswapsi2)
rev r0, r0 // reverse bytes in parameter and put into result register
bx lr
diff --git a/compiler-rt/lib/arm/divdf3vfp.S b/compiler-rt/lib/arm/divdf3vfp.S
index c62c61e..a809427 100644
--- a/compiler-rt/lib/arm/divdf3vfp.S
+++ b/compiler-rt/lib/arm/divdf3vfp.S
@@ -15,8 +15,7 @@
// Divides two double precision floating point numbers using the Darwin
// calling convention where double arguments are passsed in GPR pairs
//
- .globl ___divdf3vfp
-___divdf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__divdf3vfp)
fmdrr d6, r0, r1 // move first param from r0/r1 pair into d6
fmdrr d7, r2, r3 // move second param from r2/r3 pair into d7
fdivd d5, d6, d7
diff --git a/compiler-rt/lib/arm/divsf3vfp.S b/compiler-rt/lib/arm/divsf3vfp.S
index 4bf7463..67b8a0c 100644
--- a/compiler-rt/lib/arm/divsf3vfp.S
+++ b/compiler-rt/lib/arm/divsf3vfp.S
@@ -15,8 +15,7 @@
// Divides two single precision floating point numbers using the Darwin
// calling convention where single arguments are passsed like 32-bit ints.
//
- .globl ___divsf3vfp
-___divsf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__divsf3vfp)
fmsr s14, r0 // move first param from r0 into float register
fmsr s15, r1 // move second param from r1 into float register
fdivs s13, s14, s15
diff --git a/compiler-rt/lib/arm/eqdf2vfp.S b/compiler-rt/lib/arm/eqdf2vfp.S
index 25cc959..771d853 100644
--- a/compiler-rt/lib/arm/eqdf2vfp.S
+++ b/compiler-rt/lib/arm/eqdf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___eqdf2vfp
-___eqdf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__eqdf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/eqsf2vfp.S b/compiler-rt/lib/arm/eqsf2vfp.S
index a87b767..bf4cd1f 100644
--- a/compiler-rt/lib/arm/eqsf2vfp.S
+++ b/compiler-rt/lib/arm/eqsf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___eqsf2vfp
-___eqsf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__eqsf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15
diff --git a/compiler-rt/lib/arm/extendsfdf2vfp.S b/compiler-rt/lib/arm/extendsfdf2vfp.S
index ea251e2..8df97b5 100644
--- a/compiler-rt/lib/arm/extendsfdf2vfp.S
+++ b/compiler-rt/lib/arm/extendsfdf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a single precision parameter is
// passed in a GPR and a double precision result is returned in R0/R1 pair.
//
- .globl ___extendsfdf2vfp
-___extendsfdf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__extendsfdf2vfp)
fmsr s15, r0 // load float register from R0
fcvtds d7, s15 // convert single to double
fmrrd r0, r1, d7 // return result in r0/r1 pair
diff --git a/compiler-rt/lib/arm/fixdfsivfp.S b/compiler-rt/lib/arm/fixdfsivfp.S
index 4178859..70d8027 100644
--- a/compiler-rt/lib/arm/fixdfsivfp.S
+++ b/compiler-rt/lib/arm/fixdfsivfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a double precision parameter is
// passed in GPR register pair.
//
- .globl ___fixdfsivfp
-___fixdfsivfp:
+DEFINE_COMPILERRT_FUNCTION(__fixdfsivfp)
fmdrr d7, r0, r1 // load double register from R0/R1
ftosizd s15, d7 // convert double to 32-bit int into s15
fmrs r0, s15 // move s15 to result register
diff --git a/compiler-rt/lib/arm/fixsfsivfp.S b/compiler-rt/lib/arm/fixsfsivfp.S
index d480390..17d016c 100644
--- a/compiler-rt/lib/arm/fixsfsivfp.S
+++ b/compiler-rt/lib/arm/fixsfsivfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a single precision parameter is
// passed in a GPR..
//
- .globl ___fixsfsivfp
-___fixsfsivfp:
+DEFINE_COMPILERRT_FUNCTION(__fixsfsivfp)
fmsr s15, r0 // load float register from R0
ftosizs s15, s15 // convert single to 32-bit int into s15
fmrs r0, s15 // move s15 to result register
diff --git a/compiler-rt/lib/arm/fixunsdfsivfp.S b/compiler-rt/lib/arm/fixunsdfsivfp.S
index bd9c1b8..a7299f4 100644
--- a/compiler-rt/lib/arm/fixunsdfsivfp.S
+++ b/compiler-rt/lib/arm/fixunsdfsivfp.S
@@ -17,8 +17,7 @@
// Uses Darwin calling convention where a double precision parameter is
// passed in GPR register pair.
//
- .globl ___fixunsdfsivfp
-___fixunsdfsivfp:
+DEFINE_COMPILERRT_FUNCTION(__fixunsdfsivfp)
fmdrr d7, r0, r1 // load double register from R0/R1
ftouizd s15, d7 // convert double to 32-bit int into s15
fmrs r0, s15 // move s15 to result register
diff --git a/compiler-rt/lib/arm/fixunssfsivfp.S b/compiler-rt/lib/arm/fixunssfsivfp.S
index c8ce25f..166a2ad 100644
--- a/compiler-rt/lib/arm/fixunssfsivfp.S
+++ b/compiler-rt/lib/arm/fixunssfsivfp.S
@@ -17,8 +17,7 @@
// Uses Darwin calling convention where a single precision parameter is
// passed in a GPR..
//
- .globl ___fixunssfsivfp
-___fixunssfsivfp:
+DEFINE_COMPILERRT_FUNCTION(__fixunssfsivfp)
fmsr s15, r0 // load float register from R0
ftouizs s15, s15 // convert single to 32-bit unsigned into s15
fmrs r0, s15 // move s15 to result register
diff --git a/compiler-rt/lib/arm/floatsidfvfp.S b/compiler-rt/lib/arm/floatsidfvfp.S
index b268d04..45bfa34 100644
--- a/compiler-rt/lib/arm/floatsidfvfp.S
+++ b/compiler-rt/lib/arm/floatsidfvfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a double precision result is
// return in GPR register pair.
//
- .globl ___floatsidfvfp
-___floatsidfvfp:
+DEFINE_COMPILERRT_FUNCTION(__floatsidfvfp)
fmsr s15, r0 // move int to float register s15
fsitod d7, s15 // convert 32-bit int in s15 to double in d7
fmrrd r0, r1, d7 // move d7 to result register pair r0/r1
diff --git a/compiler-rt/lib/arm/floatsisfvfp.S b/compiler-rt/lib/arm/floatsisfvfp.S
index dea5a4e..1b74299 100644
--- a/compiler-rt/lib/arm/floatsisfvfp.S
+++ b/compiler-rt/lib/arm/floatsisfvfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a single precision result is
// return in a GPR..
//
- .globl ___floatsisfvfp
-___floatsisfvfp:
+DEFINE_COMPILERRT_FUNCTION(__floatsisfvfp)
fmsr s15, r0 // move int to float register s15
fsitos s15, s15 // convert 32-bit int in s15 to float in s15
fmrs r0, s15 // move s15 to result register
diff --git a/compiler-rt/lib/arm/floatunssidfvfp.S b/compiler-rt/lib/arm/floatunssidfvfp.S
index 077385e..9866a66 100644
--- a/compiler-rt/lib/arm/floatunssidfvfp.S
+++ b/compiler-rt/lib/arm/floatunssidfvfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a double precision result is
// return in GPR register pair.
//
- .globl ___floatunssidfvfp
-___floatunssidfvfp:
+DEFINE_COMPILERRT_FUNCTION(__floatunssidfvfp)
fmsr s15, r0 // move int to float register s15
fuitod d7, s15 // convert 32-bit int in s15 to double in d7
fmrrd r0, r1, d7 // move d7 to result register pair r0/r1
diff --git a/compiler-rt/lib/arm/floatunssisfvfp.S b/compiler-rt/lib/arm/floatunssisfvfp.S
index 3ad7194..065742b 100644
--- a/compiler-rt/lib/arm/floatunssisfvfp.S
+++ b/compiler-rt/lib/arm/floatunssisfvfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a single precision result is
// return in a GPR..
//
- .globl ___floatunssisfvfp
-___floatunssisfvfp:
+DEFINE_COMPILERRT_FUNCTION(__floatunssisfvfp)
fmsr s15, r0 // move int to float register s15
fuitos s15, s15 // convert 32-bit int in s15 to float in s15
fmrs r0, s15 // move s15 to result register
diff --git a/compiler-rt/lib/arm/gedf2vfp.S b/compiler-rt/lib/arm/gedf2vfp.S
index 3f2f6c1..cb8c716 100644
--- a/compiler-rt/lib/arm/gedf2vfp.S
+++ b/compiler-rt/lib/arm/gedf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___gedf2vfp
-___gedf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__gedf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/gesf2vfp.S b/compiler-rt/lib/arm/gesf2vfp.S
index 83b2f09..24b66e1 100644
--- a/compiler-rt/lib/arm/gesf2vfp.S
+++ b/compiler-rt/lib/arm/gesf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___gesf2vfp
-___gesf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__gesf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15
diff --git a/compiler-rt/lib/arm/gtdf2vfp.S b/compiler-rt/lib/arm/gtdf2vfp.S
index 2daa7c4..afd6d05 100644
--- a/compiler-rt/lib/arm/gtdf2vfp.S
+++ b/compiler-rt/lib/arm/gtdf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___gtdf2vfp
-___gtdf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__gtdf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/gtsf2vfp.S b/compiler-rt/lib/arm/gtsf2vfp.S
index c388865..a4a03c6 100644
--- a/compiler-rt/lib/arm/gtsf2vfp.S
+++ b/compiler-rt/lib/arm/gtsf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___gtsf2vfp
-___gtsf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__gtsf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15
diff --git a/compiler-rt/lib/arm/ledf2vfp.S b/compiler-rt/lib/arm/ledf2vfp.S
index 1ab250d..188dc6a 100644
--- a/compiler-rt/lib/arm/ledf2vfp.S
+++ b/compiler-rt/lib/arm/ledf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___ledf2vfp
-___ledf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__ledf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/lesf2vfp.S b/compiler-rt/lib/arm/lesf2vfp.S
index 8166d4b..fe3ec64 100644
--- a/compiler-rt/lib/arm/lesf2vfp.S
+++ b/compiler-rt/lib/arm/lesf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___lesf2vfp
-___lesf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__lesf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15
diff --git a/compiler-rt/lib/arm/ltdf2vfp.S b/compiler-rt/lib/arm/ltdf2vfp.S
index e17406b..15a799b 100644
--- a/compiler-rt/lib/arm/ltdf2vfp.S
+++ b/compiler-rt/lib/arm/ltdf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___ltdf2vfp
-___ltdf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__ltdf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/ltsf2vfp.S b/compiler-rt/lib/arm/ltsf2vfp.S
index f281a71..6ae0658 100644
--- a/compiler-rt/lib/arm/ltsf2vfp.S
+++ b/compiler-rt/lib/arm/ltsf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___ltsf2vfp
-___ltsf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__ltsf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15
diff --git a/compiler-rt/lib/arm/muldf3vfp.S b/compiler-rt/lib/arm/muldf3vfp.S
index 7ae256a..bb0fd43 100644
--- a/compiler-rt/lib/arm/muldf3vfp.S
+++ b/compiler-rt/lib/arm/muldf3vfp.S
@@ -15,8 +15,7 @@
// Multiplies two double precision floating point numbers using the Darwin
// calling convention where double arguments are passsed in GPR pairs
//
- .globl ___muldf3vfp
-___muldf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__muldf3vfp)
fmdrr d6, r0, r1 // move first param from r0/r1 pair into d6
fmdrr d7, r2, r3 // move second param from r2/r3 pair into d7
fmuld d6, d6, d7
diff --git a/compiler-rt/lib/arm/mulsf3vfp.S b/compiler-rt/lib/arm/mulsf3vfp.S
index 16dbdb2..69396a1 100644
--- a/compiler-rt/lib/arm/mulsf3vfp.S
+++ b/compiler-rt/lib/arm/mulsf3vfp.S
@@ -15,8 +15,7 @@
// Multiplies two single precision floating point numbers using the Darwin
// calling convention where single arguments are passsed like 32-bit ints.
//
- .globl ___mulsf3vfp
-___mulsf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__mulsf3vfp)
fmsr s14, r0 // move first param from r0 into float register
fmsr s15, r1 // move second param from r1 into float register
fmuls s13, s14, s15
diff --git a/compiler-rt/lib/arm/nedf2vfp.S b/compiler-rt/lib/arm/nedf2vfp.S
index a7541de..a445cda 100644
--- a/compiler-rt/lib/arm/nedf2vfp.S
+++ b/compiler-rt/lib/arm/nedf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___nedf2vfp
-___nedf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__nedf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/negdf2vfp.S b/compiler-rt/lib/arm/negdf2vfp.S
index bff2767..9cbfc6a 100644
--- a/compiler-rt/lib/arm/negdf2vfp.S
+++ b/compiler-rt/lib/arm/negdf2vfp.S
@@ -15,7 +15,6 @@
// Returns the negation a double precision floating point numbers using the
// Darwin calling convention where double arguments are passsed in GPR pairs.
//
- .globl ___negdf2vfp
-___negdf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__negdf2vfp)
eor r1, r1, #-2147483648 // flip sign bit on double in r0/r1 pair
bx lr
diff --git a/compiler-rt/lib/arm/negsf2vfp.S b/compiler-rt/lib/arm/negsf2vfp.S
index 9b0ce28..6d78ef1 100644
--- a/compiler-rt/lib/arm/negsf2vfp.S
+++ b/compiler-rt/lib/arm/negsf2vfp.S
@@ -15,7 +15,6 @@
// Returns the negation of a single precision floating point numbers using the
// Darwin calling convention where single arguments are passsed like 32-bit ints
//
- .globl ___negsf2vfp
-___negsf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__negsf2vfp)
eor r0, r0, #-2147483648 // flip sign bit on float in r0
bx lr
diff --git a/compiler-rt/lib/arm/nesf2vfp.S b/compiler-rt/lib/arm/nesf2vfp.S
index ee37c1d..62d80a5 100644
--- a/compiler-rt/lib/arm/nesf2vfp.S
+++ b/compiler-rt/lib/arm/nesf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___nesf2vfp
-___nesf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__nesf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15
diff --git a/compiler-rt/lib/arm/subdf3vfp.S b/compiler-rt/lib/arm/subdf3vfp.S
index ebeca2f..b9cb29e7 100644
--- a/compiler-rt/lib/arm/subdf3vfp.S
+++ b/compiler-rt/lib/arm/subdf3vfp.S
@@ -15,8 +15,7 @@
// Returns difference between two double precision floating point numbers using
// the Darwin calling convention where double arguments are passsed in GPR pairs
//
- .globl ___subdf3vfp
-___subdf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__subdf3vfp)
fmdrr d6, r0, r1 // move first param from r0/r1 pair into d6
fmdrr d7, r2, r3 // move second param from r2/r3 pair into d7
fsubd d6, d6, d7
diff --git a/compiler-rt/lib/arm/subsf3vfp.S b/compiler-rt/lib/arm/subsf3vfp.S
index 3e9d602..b6942bd 100644
--- a/compiler-rt/lib/arm/subsf3vfp.S
+++ b/compiler-rt/lib/arm/subsf3vfp.S
@@ -16,8 +16,7 @@
// using the Darwin calling convention where single arguments are passsed
// like 32-bit ints.
//
- .globl ___subsf3vfp
-___subsf3vfp:
+DEFINE_COMPILERRT_FUNCTION(__subsf3vfp)
fmsr s14, r0 // move first param from r0 into float register
fmsr s15, r1 // move second param from r1 into float register
fsubs s14, s14, s15
diff --git a/compiler-rt/lib/arm/switch.S b/compiler-rt/lib/arm/switch.S
index 7b11c4f..2d94912 100644
--- a/compiler-rt/lib/arm/switch.S
+++ b/compiler-rt/lib/arm/switch.S
@@ -29,9 +29,7 @@
// The table contains unsigned byte sized elements which are 1/2 the distance
// from lr to the target label.
//
- .globl ___switchu8
- .private_extern ___switchu8
-___switchu8:
+DEFINE_COMPILERRT_PRIVATE_FUNCTION(__switchu8)
ldrb ip, [lr, #-1] // get first byte in table
cmp r0, ip // compare with index
ldrbcc r0, [lr, r0] // get indexed byte out of table
@@ -45,9 +43,7 @@
// The table contains signed byte sized elements which are 1/2 the distance
// from lr to the target label.
//
- .globl ___switch8
- .private_extern ___switch8
-___switch8:
+DEFINE_COMPILERRT_PRIVATE_FUNCTION(__switch8)
ldrb ip, [lr, #-1] // get first byte in table
cmp r0, ip // signed compare with index
ldrsbcc r0, [lr, r0] // get indexed byte out of table
@@ -60,9 +56,7 @@
// The table contains signed 2-byte sized elements which are 1/2 the distance
// from lr to the target label.
//
- .globl ___switch16
- .private_extern ___switch16
-___switch16:
+DEFINE_COMPILERRT_PRIVATE_FUNCTION(__switch16)
ldrh ip, [lr, #-1] // get first 16-bit word in table
cmp r0, ip // compare with index
add r0, lr, r0, lsl #1 // compute address of element in table
@@ -77,9 +71,7 @@
// The table contains signed 4-byte sized elements which are the distance
// from lr to the target label.
//
- .globl ___switch32
- .private_extern ___switch32
-___switch32:
+DEFINE_COMPILERRT_PRIVATE_FUNCTION(__switch32)
ldr ip, [lr, #-1] // get first 32-bit word in table
cmp r0, ip // compare with index
add r0, lr, r0, lsl #2 // compute address of element in table
diff --git a/compiler-rt/lib/arm/truncdfsf2vfp.S b/compiler-rt/lib/arm/truncdfsf2vfp.S
index 0d635be..26f8b82 100644
--- a/compiler-rt/lib/arm/truncdfsf2vfp.S
+++ b/compiler-rt/lib/arm/truncdfsf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where a double precision parameter is
// passed in a R0/R1 pair and a signle precision result is returned in R0.
//
- .globl ___truncdfsf2vfp
-___truncdfsf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__truncdfsf2vfp)
fmdrr d7, r0, r1 // load double from r0/r1 pair
fcvtsd s15, d7 // convert double to single (trucate precision)
fmrs r0, s15 // return result in r0
diff --git a/compiler-rt/lib/arm/unorddf2vfp.S b/compiler-rt/lib/arm/unorddf2vfp.S
index 85968b4..6b4bcb6 100644
--- a/compiler-rt/lib/arm/unorddf2vfp.S
+++ b/compiler-rt/lib/arm/unorddf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where double precision arguments are passsed
// like in GPR pairs.
//
- .globl ___unorddf2vfp
-___unorddf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__unorddf2vfp)
fmdrr d6, r0, r1 // load r0/r1 pair in double register
fmdrr d7, r2, r3 // load r2/r3 pair in double register
fcmpd d6, d7
diff --git a/compiler-rt/lib/arm/unordsf2vfp.S b/compiler-rt/lib/arm/unordsf2vfp.S
index 852d4eb..811d8cb 100644
--- a/compiler-rt/lib/arm/unordsf2vfp.S
+++ b/compiler-rt/lib/arm/unordsf2vfp.S
@@ -16,8 +16,7 @@
// Uses Darwin calling convention where single precision arguments are passsed
// like 32-bit ints
//
- .globl ___unordsf2vfp
-___unordsf2vfp:
+DEFINE_COMPILERRT_FUNCTION(__unordsf2vfp)
fmsr s14, r0 // move from GPR 0 to float register
fmsr s15, r1 // move from GPR 1 to float register
fcmps s14, s15