14 files changed, 54 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index aa41616441..31996a0931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 2017-11-28  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/aarch64/fpu/s_ceilf.c: Include <libm-alias-float.h>.
+	(ceilf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_floorf.c: Include <libm-alias-float.h>.
+	(floorf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_fmaf.c: Include <libm-alias-float.h>.
+	(fmaf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_fmaxf.c: Include <libm-alias-float.h>.
+	(fmaxf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_fminf.c: Include <libm-alias-float.h>.
+	(fminf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_llrintf.c: Include <libm-alias-float.h>.
+	(llrintf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_llroundf.c: Include <libm-alias-float.h>.
+	(llroundf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_lrintf.c: Include <libm-alias-float.h>.
+	(lrintf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_lroundf.c: Include <libm-alias-float.h>.
+	(lroundf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_nearbyintf.c: Include
+	<libm-alias-float.h>.
+	(nearbyintf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_rintf.c: Include <libm-alias-float.h>.
+	(rintf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_roundf.c: Include <libm-alias-float.h>.
+	(roundf): Define using libm_alias_float.
+	* sysdeps/aarch64/fpu/s_truncf.c: Include <libm-alias-float.h>.
+	(truncf): Define using libm_alias_float.
+
 	* sysdeps/alpha/fpu/s_ceil.c: Include <libm-alias-double.h>.
 	(ceil): Define using libm_alias_double.
 	* sysdeps/alpha/fpu/s_copysign.c: Include <libm-alias-double.h>.
diff --git a/sysdeps/aarch64/fpu/s_ceilf.c b/sysdeps/aarch64/fpu/s_ceilf.c
index d5c438335e..304af6b1d2 100644
--- a/sysdeps/aarch64/fpu/s_ceilf.c
+++ b/sysdeps/aarch64/fpu/s_ceilf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __ceilf (float x)
@@ -24,4 +25,4 @@ __ceilf (float x)
   return __builtin_ceilf (x);
 }
 
-weak_alias (__ceilf, ceilf)
+libm_alias_float (__ceil, ceil)
diff --git a/sysdeps/aarch64/fpu/s_floorf.c b/sysdeps/aarch64/fpu/s_floorf.c
index fa6fa17907..1391c04b3c 100644
--- a/sysdeps/aarch64/fpu/s_floorf.c
+++ b/sysdeps/aarch64/fpu/s_floorf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __floorf (float x)
@@ -24,4 +25,4 @@ __floorf (float x)
   return __builtin_floorf (x);
 }
 
-weak_alias (__floorf, floorf)
+libm_alias_float (__floor, floor)
diff --git a/sysdeps/aarch64/fpu/s_fmaf.c b/sysdeps/aarch64/fpu/s_fmaf.c
index ff1abbf5b4..bd39e04dbc 100644
--- a/sysdeps/aarch64/fpu/s_fmaf.c
+++ b/sysdeps/aarch64/fpu/s_fmaf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __fmaf (float x, float y, float z)
@@ -24,4 +25,4 @@ __fmaf (float x, float y, float z)
   return __builtin_fmaf (x, y, z);
 }
 
-weak_alias (__fmaf, fmaf)
+libm_alias_float (__fma, fma)
diff --git a/sysdeps/aarch64/fpu/s_fmaxf.c b/sysdeps/aarch64/fpu/s_fmaxf.c
index ec4dcdd8c0..56a1a48dbd 100644
--- a/sysdeps/aarch64/fpu/s_fmaxf.c
+++ b/sysdeps/aarch64/fpu/s_fmaxf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __fmaxf (float x, float y)
@@ -24,4 +25,4 @@ __fmaxf (float x, float y)
   return __builtin_fmaxf (x, y);
 }
 
-weak_alias (__fmaxf, fmaxf)
+libm_alias_float (__fmax, fmax)
diff --git a/sysdeps/aarch64/fpu/s_fminf.c b/sysdeps/aarch64/fpu/s_fminf.c
index 7d3a3a3a32..e7fba2d3fe 100644
--- a/sysdeps/aarch64/fpu/s_fminf.c
+++ b/sysdeps/aarch64/fpu/s_fminf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __fminf (float x, float y)
@@ -24,4 +25,4 @@ __fminf (float x, float y)
   return __builtin_fminf (x, y);
 }
 
-weak_alias (__fminf, fminf)
+libm_alias_float (__fmin, fmin)
diff --git a/sysdeps/aarch64/fpu/s_llrintf.c b/sysdeps/aarch64/fpu/s_llrintf.c
index dac73f2058..94c0635015 100644
--- a/sysdeps/aarch64/fpu/s_llrintf.c
+++ b/sysdeps/aarch64/fpu/s_llrintf.c
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-float.h>
 
 long long int
 __llrintf (float x)
@@ -32,4 +33,4 @@ __llrintf (float x)
   return r;
 }
 
-weak_alias (__llrintf, llrintf)
+libm_alias_float (__llrint, llrint)
diff --git a/sysdeps/aarch64/fpu/s_llroundf.c b/sysdeps/aarch64/fpu/s_llroundf.c
index 0ca390baec..e45b3f987b 100644
--- a/sysdeps/aarch64/fpu/s_llroundf.c
+++ b/sysdeps/aarch64/fpu/s_llroundf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 long long int
 __llroundf (float x)
@@ -24,4 +25,4 @@ __llroundf (float x)
   return __builtin_llroundf (x);
 }
 
-weak_alias (__llroundf, llroundf)
+libm_alias_float (__llround, llround)
diff --git a/sysdeps/aarch64/fpu/s_lrintf.c b/sysdeps/aarch64/fpu/s_lrintf.c
index 5b6a426937..3ce7c91b1f 100644
--- a/sysdeps/aarch64/fpu/s_lrintf.c
+++ b/sysdeps/aarch64/fpu/s_lrintf.c
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-float.h>
 
 long int
 __lrintf (float x)
@@ -31,4 +32,4 @@ __lrintf (float x)
   return r;
 }
 
-weak_alias (__lrintf, lrintf)
+libm_alias_float (__lrint, lrint)
diff --git a/sysdeps/aarch64/fpu/s_lroundf.c b/sysdeps/aarch64/fpu/s_lroundf.c
index baf06938be..fbf020286d 100644
--- a/sysdeps/aarch64/fpu/s_lroundf.c
+++ b/sysdeps/aarch64/fpu/s_lroundf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 long int
 __lroundf (float x)
@@ -24,4 +25,4 @@ __lroundf (float x)
   return __builtin_lroundf (x);
 }
 
-weak_alias (__lroundf, lroundf)
+libm_alias_float (__lround, lround)
diff --git a/sysdeps/aarch64/fpu/s_nearbyintf.c b/sysdeps/aarch64/fpu/s_nearbyintf.c
index de69fd9b82..b373e376f3 100644
--- a/sysdeps/aarch64/fpu/s_nearbyintf.c
+++ b/sysdeps/aarch64/fpu/s_nearbyintf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __nearbyintf (float x)
@@ -24,4 +25,4 @@ __nearbyintf (float x)
   return __builtin_nearbyintf (x);
 }
 
-weak_alias (__nearbyintf, nearbyintf)
+libm_alias_float (__nearbyint, nearbyint)
diff --git a/sysdeps/aarch64/fpu/s_rintf.c b/sysdeps/aarch64/fpu/s_rintf.c
index d0f70ce925..ee4961584d 100644
--- a/sysdeps/aarch64/fpu/s_rintf.c
+++ b/sysdeps/aarch64/fpu/s_rintf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __rintf (float x)
@@ -24,4 +25,4 @@ __rintf (float x)
   return __builtin_rintf (x);
 }
 
-weak_alias (__rintf, rintf)
+libm_alias_float (__rint, rint)
diff --git a/sysdeps/aarch64/fpu/s_roundf.c b/sysdeps/aarch64/fpu/s_roundf.c
index 66c8ee6d09..34bed497b2 100644
--- a/sysdeps/aarch64/fpu/s_roundf.c
+++ b/sysdeps/aarch64/fpu/s_roundf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __roundf (float x)
@@ -24,4 +25,4 @@ __roundf (float x)
   return __builtin_roundf (x);
 }
 
-weak_alias (__roundf, roundf)
+libm_alias_float (__round, round)
diff --git a/sysdeps/aarch64/fpu/s_truncf.c b/sysdeps/aarch64/fpu/s_truncf.c
index b7890a2d94..381c3e8d30 100644
--- a/sysdeps/aarch64/fpu/s_truncf.c
+++ b/sysdeps/aarch64/fpu/s_truncf.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-float.h>
 
 float
 __truncf (float x)
@@ -24,4 +25,4 @@ __truncf (float x)
   return __builtin_truncf (x);
 }
 
-weak_alias (__truncf, truncf)
+libm_alias_float (__trunc, trunc)