From 847c9161c7745b7e15f841a1ec40fe11d5aae515 Mon Sep 17 00:00:00 2001
From: "Paul E. Murphy" <murphyp@linux.vnet.ibm.com>
Date: Thu, 25 Aug 2016 16:48:03 -0500
Subject: Make common fmax implementation generic.

Also update aarch64 to ensure the correct s_fmin.c is included.
The include order favors including the generated copy.
---
 sysdeps/ieee754/ldbl-opt/math-type-macros-double.h | 1 +
 sysdeps/ieee754/ldbl-opt/s_fmax.c                  | 5 -----
 sysdeps/ieee754/ldbl-opt/s_fmaxl.c                 | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 sysdeps/ieee754/ldbl-opt/s_fmax.c
 delete mode 100644 sysdeps/ieee754/ldbl-opt/s_fmaxl.c

(limited to 'sysdeps/ieee754')

diff --git a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h b/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h
index e78a5e3..808d2c5 100644
--- a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h
+++ b/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h
@@ -45,6 +45,7 @@
 #define LDOUBLE_clog10l_libm_version GLIBC_2_1
 #define LDOUBLE___clog10l_libm_version GLIBC_2_1
 #define LDOUBLE_fdiml_libm_version GLIBC_2_1
+#define LDOUBLE_fmaxl_libm_version GLIBC_2_1
 
 /* Define compat symbols for long double on platforms
    where it was not always a distinct type.  */
diff --git a/sysdeps/ieee754/ldbl-opt/s_fmax.c b/sysdeps/ieee754/ldbl-opt/s_fmax.c
deleted file mode 100644
index 11e7591..0000000
--- a/sysdeps/ieee754/ldbl-opt/s_fmax.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <math/s_fmax.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __fmax, fmaxl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_fmaxl.c b/sysdeps/ieee754/ldbl-opt/s_fmaxl.c
deleted file mode 100644
index 98221b2..0000000
--- a/sysdeps/ieee754/ldbl-opt/s_fmaxl.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/s_fmaxl.c>
-long_double_symbol (libm, __fmaxl, fmaxl);
-- 
cgit v1.1