From f07d2ec8c02cf378d40122222b0b1f7ed263457f Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 27 Nov 2017 23:54:32 +0000
Subject: [PATCH] Use libm_alias_double for aarch64.

Continuing the preparation for additional _FloatN / _FloatNx function
aliases, this patch makes aarch64 libm function implementations use
libm_alias_double to define function aliases.

Tested with build-many-glibcs.py for aarch64-linux-gnu that installed
stripped shared libraries are unchanged by the patch.

	* sysdeps/aarch64/fpu/s_ceil.c: Include <libm-alias-double.h>.
	(ceil): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_floor.c: Include <libm-alias-double.h>.
	(floor): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_fma.c: Include <libm-alias-double.h>.
	(fma): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_fmax.c: Include <libm-alias-double.h>.
	(fmax): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_fmin.c: Include <libm-alias-double.h>.
	(fmin): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_llrint.c: Include <libm-alias-double.h>.
	(llrint): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_llround.c: Include <libm-alias-double.h>.
	(llround): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_lrint.c: Include <libm-alias-double.h>.
	(lrint): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_lround.c: Include <libm-alias-double.h>.
	(lround): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_nearbyint.c: Include <libm-alias-double.h>.
	(nearbyint): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_rint.c: Include <libm-alias-double.h>.
	(rint): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_round.c: Include <libm-alias-double.h>.
	(round): Define using libm_alias_double.
	* sysdeps/aarch64/fpu/s_trunc.c: Include <libm-alias-double.h>.
	(trunc): Define using libm_alias_double.
---
 ChangeLog                         | 29 +++++++++++++++++++++++++++++
 sysdeps/aarch64/fpu/s_ceil.c      |  3 ++-
 sysdeps/aarch64/fpu/s_floor.c     |  3 ++-
 sysdeps/aarch64/fpu/s_fma.c       |  3 ++-
 sysdeps/aarch64/fpu/s_fmax.c      |  3 ++-
 sysdeps/aarch64/fpu/s_fmin.c      |  3 ++-
 sysdeps/aarch64/fpu/s_llrint.c    |  3 ++-
 sysdeps/aarch64/fpu/s_llround.c   |  3 ++-
 sysdeps/aarch64/fpu/s_lrint.c     |  3 ++-
 sysdeps/aarch64/fpu/s_lround.c    |  3 ++-
 sysdeps/aarch64/fpu/s_nearbyint.c |  3 ++-
 sysdeps/aarch64/fpu/s_rint.c      |  3 ++-
 sysdeps/aarch64/fpu/s_round.c     |  3 ++-
 sysdeps/aarch64/fpu/s_trunc.c     |  3 ++-
 14 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7779c6b59..be3e856c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2017-11-27  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/aarch64/fpu/s_ceil.c: Include <libm-alias-double.h>.
+	(ceil): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_floor.c: Include <libm-alias-double.h>.
+	(floor): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_fma.c: Include <libm-alias-double.h>.
+	(fma): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_fmax.c: Include <libm-alias-double.h>.
+	(fmax): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_fmin.c: Include <libm-alias-double.h>.
+	(fmin): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_llrint.c: Include <libm-alias-double.h>.
+	(llrint): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_llround.c: Include <libm-alias-double.h>.
+	(llround): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_lrint.c: Include <libm-alias-double.h>.
+	(lrint): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_lround.c: Include <libm-alias-double.h>.
+	(lround): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_nearbyint.c: Include <libm-alias-double.h>.
+	(nearbyint): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_rint.c: Include <libm-alias-double.h>.
+	(rint): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_round.c: Include <libm-alias-double.h>.
+	(round): Define using libm_alias_double.
+	* sysdeps/aarch64/fpu/s_trunc.c: Include <libm-alias-double.h>.
+	(trunc): Define using libm_alias_double.
+
 2017-11-27  Florian Weimer  <fweimer@redhat.com>
 
 	* sysdeps/unix/sysv/linux/mlock2.c: New file.
diff --git a/sysdeps/aarch64/fpu/s_ceil.c b/sysdeps/aarch64/fpu/s_ceil.c
index bc90ab98db..a3c73c0c88 100644
--- a/sysdeps/aarch64/fpu/s_ceil.c
+++ b/sysdeps/aarch64/fpu/s_ceil.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __ceil (double x)
@@ -24,4 +25,4 @@ __ceil (double x)
   return __builtin_ceil (x);
 }
 
-weak_alias (__ceil, ceil)
+libm_alias_double (__ceil, ceil)
diff --git a/sysdeps/aarch64/fpu/s_floor.c b/sysdeps/aarch64/fpu/s_floor.c
index 049535c8bf..357b069842 100644
--- a/sysdeps/aarch64/fpu/s_floor.c
+++ b/sysdeps/aarch64/fpu/s_floor.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __floor (double x)
@@ -24,4 +25,4 @@ __floor (double x)
   return __builtin_floor (x);
 }
 
-weak_alias (__floor, floor)
+libm_alias_double (__floor, floor)
diff --git a/sysdeps/aarch64/fpu/s_fma.c b/sysdeps/aarch64/fpu/s_fma.c
index e496ec6438..e13626da61 100644
--- a/sysdeps/aarch64/fpu/s_fma.c
+++ b/sysdeps/aarch64/fpu/s_fma.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __fma (double x, double y, double z)
@@ -24,4 +25,4 @@ __fma (double x, double y, double z)
   return __builtin_fma (x, y, z);
 }
 
-weak_alias (__fma, fma)
+libm_alias_double (__fma, fma)
diff --git a/sysdeps/aarch64/fpu/s_fmax.c b/sysdeps/aarch64/fpu/s_fmax.c
index d7a82f8980..bfc7d0c391 100644
--- a/sysdeps/aarch64/fpu/s_fmax.c
+++ b/sysdeps/aarch64/fpu/s_fmax.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __fmax (double x, double y)
@@ -24,4 +25,4 @@ __fmax (double x, double y)
   return __builtin_fmax (x, y);
 }
 
-weak_alias (__fmax, fmax)
+libm_alias_double (__fmax, fmax)
diff --git a/sysdeps/aarch64/fpu/s_fmin.c b/sysdeps/aarch64/fpu/s_fmin.c
index bba894e9b0..20bbebcfa3 100644
--- a/sysdeps/aarch64/fpu/s_fmin.c
+++ b/sysdeps/aarch64/fpu/s_fmin.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __fmin (double x, double y)
@@ -24,4 +25,4 @@ __fmin (double x, double y)
   return __builtin_fmin (x, y);
 }
 
-weak_alias (__fmin, fmin)
+libm_alias_double (__fmin, fmin)
diff --git a/sysdeps/aarch64/fpu/s_llrint.c b/sysdeps/aarch64/fpu/s_llrint.c
index f0e0b09b52..d69bf5f88f 100644
--- a/sysdeps/aarch64/fpu/s_llrint.c
+++ b/sysdeps/aarch64/fpu/s_llrint.c
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-double.h>
 
 long long int
 __llrint (double x)
@@ -31,4 +32,4 @@ __llrint (double x)
   return r;
 }
 
-weak_alias (__llrint, llrint)
+libm_alias_double (__llrint, llrint)
diff --git a/sysdeps/aarch64/fpu/s_llround.c b/sysdeps/aarch64/fpu/s_llround.c
index 2902946bcd..88d1956fa5 100644
--- a/sysdeps/aarch64/fpu/s_llround.c
+++ b/sysdeps/aarch64/fpu/s_llround.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 long long int
 __llround (double x)
@@ -24,4 +25,4 @@ __llround (double x)
   return __builtin_llround (x);
 }
 
-weak_alias (__llround, llround)
+libm_alias_double (__llround, llround)
diff --git a/sysdeps/aarch64/fpu/s_lrint.c b/sysdeps/aarch64/fpu/s_lrint.c
index ee645ad29e..bfb31ece8d 100644
--- a/sysdeps/aarch64/fpu/s_lrint.c
+++ b/sysdeps/aarch64/fpu/s_lrint.c
@@ -20,6 +20,7 @@
 #include <get-rounding-mode.h>
 #include <stdint.h>
 #include <math_private.h>
+#include <libm-alias-double.h>
 
 # define IREG_SIZE 64
 
@@ -84,4 +85,4 @@ __lrint (double x)
   return r;
 }
 
-weak_alias (__lrint, lrint)
+libm_alias_double (__lrint, lrint)
diff --git a/sysdeps/aarch64/fpu/s_lround.c b/sysdeps/aarch64/fpu/s_lround.c
index 90c3163e8e..2afadd959f 100644
--- a/sysdeps/aarch64/fpu/s_lround.c
+++ b/sysdeps/aarch64/fpu/s_lround.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 long int
 __lround (double x)
@@ -24,4 +25,4 @@ __lround (double x)
   return __builtin_lround (x);
  }
 
-weak_alias (__lround, lround)
+libm_alias_double (__lround, lround)
diff --git a/sysdeps/aarch64/fpu/s_nearbyint.c b/sysdeps/aarch64/fpu/s_nearbyint.c
index 6ba5de11e7..1df56152e9 100644
--- a/sysdeps/aarch64/fpu/s_nearbyint.c
+++ b/sysdeps/aarch64/fpu/s_nearbyint.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __nearbyint (double x)
@@ -24,4 +25,4 @@ __nearbyint (double x)
   return __builtin_nearbyint (x);
 }
 
-weak_alias (__nearbyint, nearbyint)
+libm_alias_double (__nearbyint, nearbyint)
diff --git a/sysdeps/aarch64/fpu/s_rint.c b/sysdeps/aarch64/fpu/s_rint.c
index b4ac349fc0..1d0b469e2c 100644
--- a/sysdeps/aarch64/fpu/s_rint.c
+++ b/sysdeps/aarch64/fpu/s_rint.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __rint (double x)
@@ -24,4 +25,4 @@ __rint (double x)
   return __builtin_rint (x);
 }
 
-weak_alias (__rint, rint)
+libm_alias_double (__rint, rint)
diff --git a/sysdeps/aarch64/fpu/s_round.c b/sysdeps/aarch64/fpu/s_round.c
index a34fca1196..1937a7ad09 100644
--- a/sysdeps/aarch64/fpu/s_round.c
+++ b/sysdeps/aarch64/fpu/s_round.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __round (double x)
@@ -24,4 +25,4 @@ __round (double x)
   return __builtin_round (x);
 }
 
-weak_alias (__round, round)
+libm_alias_double (__round, round)
diff --git a/sysdeps/aarch64/fpu/s_trunc.c b/sysdeps/aarch64/fpu/s_trunc.c
index 6550dfcdb6..20374b7779 100644
--- a/sysdeps/aarch64/fpu/s_trunc.c
+++ b/sysdeps/aarch64/fpu/s_trunc.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __trunc (double x)
@@ -24,4 +25,4 @@ __trunc (double x)
   return __builtin_trunc (x);
 }
 
-weak_alias (__trunc, trunc)
+libm_alias_double (__trunc, trunc)
-- 
2.11.4.GIT