From 7b7c39450b3c4ab35b4960346e61d7b177ee728e Mon Sep 17 00:00:00 2001
From: "Paul E. Murphy" <murphyp@linux.vnet.ibm.com>
Date: Thu, 25 Aug 2016 11:25:33 -0500
Subject: Make common fdim implementation generic.

The only difference is the usage of math_narrow_eval when
building s_fdiml.c.  This should be harmless for long double,
but I did observe some code generation changes on m68k, but
lack the resources to test it.

Likewise, to more easily support overriding symbol generation,
the aliasing macros are always conditionally defined on their
absence to reduce boilerplate.

I also ran builds for i486, ppc64, sparcv9, aarch64,
s390x and observed no changes to s_fdim* objects.
---
 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim-vis3.c  | 2 ++
 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c       | 3 ++-
 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf-vis3.c | 1 +
 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c      | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'sysdeps/sparc/sparc32')

diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim-vis3.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim-vis3.c
index 2973b49ffb..61765173b7 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim-vis3.c
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim-vis3.c
@@ -19,5 +19,7 @@
 #include <math.h>
 
 #define __fdim __fdim_vis3
+#define declare_mgen_alias(t, f)
+#define M_LIBM_NEED_COMPAT(f) 0
 
 #include <math/s_fdim.c>
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
index 9666741fd1..2d07f312b4 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
@@ -27,6 +27,7 @@ sparc_libm_ifunc(__fdim, hwcap & HWCAP_SPARC_VIS3 ? __fdim_vis3 : __fdim_generic
 weak_alias (__fdim, fdim)
 
 # define __fdim __fdim_generic
+# define declare_mgen_alias(t, f)
 #endif
 
-#include <ldbl-opt/s_fdim.c>
+#include <math/s_fdim.c>
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf-vis3.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf-vis3.c
index 75997c62d7..3f35b0dbff 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf-vis3.c
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf-vis3.c
@@ -19,5 +19,6 @@
 #include <math.h>
 
 #define __fdimf __fdimf_vis3
+#define declare_mgen_alias(t, f)
 
 #include <math/s_fdimf.c>
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c
index 767520fb18..b9add1c355 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c
@@ -27,6 +27,8 @@ sparc_libm_ifunc(__fdimf, hwcap & HWCAP_SPARC_VIS3 ? __fdimf_vis3 : __fdimf_gene
 weak_alias (__fdimf, fdimf)
 
 # define __fdimf __fdimf_generic
+# define declare_mgen_alias(t, f)
+
 #endif
 
 #include <math/s_fdimf.c>
-- 
cgit 1.4.1