am 79641f96: am 83c0028e: Merge "For libm, use a macro for aliasing symbols."

* commit '79641f96eb68fff13f6265abcfd18477cd3650c3':
  For libm, use a macro for aliasing symbols.

libc/private/bionic_asm.h

@@ -57,4 +57,8 @@
     ENTRY(f); \
     .hidden f \
 
+#define ALIAS_SYMBOL(alias, original) \
+    .globl alias; \
+    .equ alias, original
+
 #endif /* _PRIVATE_BIONIC_ASM_H_ */

libm/arm/e_sqrt.S

@@ -39,7 +39,4 @@ ENTRY(sqrt)
     bx          lr
 END(sqrt)
 
-#if LDBL_MANT_DIG == 53
+ALIAS_SYMBOL(sqrtl, sqrt);
-    .weak       sqrtl
-    .equ        sqrtl, sqrt
-#endif

libm/arm/s_floor.S

@@ -136,7 +136,4 @@ ENTRY(floor)    /* x in r0, r1 */
 
 END(floor)
 
-#if LDBL_MANT_DIG == 53
+ALIAS_SYMBOL(floorl, floor);
-        .weak           floorl
-        .equ            floorl,floor
-#endif

libm/arm64/lrint.S

@@ -29,8 +29,6 @@ ENTRY(lrintf)
 END(lrintf)
 
 // sizeof(long) and sizeof(long long) are the same for aarch64
-.weak llrint
+ALIAS_SYMBOL(llrint, lrint);
-.equ llrint,lrint
 
-.weak llrintf
+ALIAS_SYMBOL(llrintf, lrintf);
-.equ llrintf,lrintf

libm/x86/ceil.S

@@ -40,5 +40,4 @@ ENTRY(ceil)
 	ret
 END(ceil)
 
-.globl ceill;
+ALIAS_SYMBOL(ceill, ceil);
-.equ ceill, ceil;

libm/x86/e_acos.S

@@ -388,8 +388,7 @@ END(acos)
 # -- End  acos
 
 # Start file scope ASM
-.weak acosl
+ALIAS_SYMBOL(acosl, acos);
-.equ acosl, acos
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_asin.S

@@ -466,8 +466,7 @@ END(asin)
 # -- End  asin
 
 # Start file scope ASM
-.weak asinl
+ALIAS_SYMBOL(asinl, asin);
-.equ asinl, asin
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_atan2.S

@@ -452,8 +452,7 @@ END(atan2)
 # -- End  atan2
 
 # Start file scope ASM
-.weak atan2l
+ALIAS_SYMBOL(atan2l, atan2);
-.equ atan2l, atan2
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_cosh.S

@@ -272,8 +272,7 @@ END(cosh)
 # -- End  cosh
 
 # Start file scope ASM
-.weak coshl
+ALIAS_SYMBOL(coshl, cosh);
-.equ coshl, cosh
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_exp.S

@@ -257,8 +257,7 @@ END(exp)
 # -- End  exp
 
 # Start file scope ASM
-.weak expl
+ALIAS_SYMBOL(expl, exp);
-.equ expl, exp
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_hypot.S

@@ -199,8 +199,7 @@ END(hypot)
 # -- End  hypot
 
 # Start file scope ASM
-.weak hypotl
+ALIAS_SYMBOL(hypotl, hypot);
-.equ hypotl, hypot
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_log.S

@@ -231,8 +231,7 @@ END(log)
 # -- End  log
 
 # Start file scope ASM
-.weak logl
+ALIAS_SYMBOL(logl, log);
-.equ logl, log
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_log10.S

@@ -242,8 +242,7 @@ END(log10)
 # -- End  log10
 
 # Start file scope ASM
-.weak log10l
+ALIAS_SYMBOL(log10l, log10);
-.equ log10l, log10
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/e_sinh.S

@@ -324,8 +324,7 @@ END(sinh)
 # -- End  sinh
 
 # Start file scope ASM
-.weak sinhl
+ALIAS_SYMBOL(sinhl, sinh);
-.equ sinhl, sinh
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/floor.S

@@ -40,5 +40,4 @@ ENTRY(floor)
 	ret
 END(floor)
 
-.globl floorl;
+ALIAS_SYMBOL(floorl, floor);
-.equ floorl, floor;

libm/x86/s_atan.S

@@ -245,8 +245,7 @@ END(atan)
 # -- End  atan
 
 # Start file scope ASM
-.weak atanl
+ALIAS_SYMBOL(atanl, atan);
-.equ atanl, atan
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_cbrt.S

@@ -225,8 +225,7 @@ END(cbrt)
 # -- End  cbrt
 
 # Start file scope ASM
-.weak cbrtl
+ALIAS_SYMBOL(cbrtl, cbrt);
-.equ cbrtl, cbrt
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_cos.S

@@ -314,8 +314,7 @@ END(cos)
 # -- End  cos
 
 # Start file scope ASM
-.weak cosl
+ALIAS_SYMBOL(cosl, cos);
-.equ cosl, cos
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_expm1.S

@@ -365,8 +365,7 @@ END(expm1)
 # -- End  expm1
 
 # Start file scope ASM
-.weak expm1l
+ALIAS_SYMBOL(exmp1l, exmp1);
-.equ expm1l, expm1
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_log1p.S

@@ -266,8 +266,7 @@ END(log1p)
 # -- End  log1p
 
 # Start file scope ASM
-.weak log1pl
+ALIAS_SYMBOL(log1pl, log1p);
-.equ log1pl, log1p
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_sin.S

@@ -321,8 +321,7 @@ END(sin)
 # -- End  sin
 
 # Start file scope ASM
-.weak sinl
+ALIAS_SYMBOL(sinl, sin);
-.equ sinl, sin
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_tan.S

@@ -284,8 +284,7 @@ END(tan)
 # -- End  tan
 
 # Start file scope ASM
-.weak tanl
+ALIAS_SYMBOL(tanl, tan);
-.equ tanl, tan
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/s_tanh.S

@@ -278,8 +278,7 @@ END(tanh)
 # -- End  tanh
 
 # Start file scope ASM
-.weak tanhl
+ALIAS_SYMBOL(tanhl, tanh);
-.equ tanhl, tanh
 # End file scope ASM
 	.section .rodata, "a"
 	.align 16

libm/x86/sqrt.S

@@ -40,5 +40,4 @@ ENTRY(sqrt)
 	ret
 END(sqrt)
 
-.globl sqrtl;
+ALIAS_SYMBOL(sqrtl, sqrt);
-.equ sqrtl, sqrt;

libm/x86/trunc.S

@@ -40,5 +40,4 @@ ENTRY(trunc)
 	ret
 END(trunc)
 
-.globl truncl;
+ALIAS_SYMBOL(truncl, trunc);
-.equ truncl, trunc;