diff options
| author | Paul E. Murphy <murphyp@linux.vnet.ibm.com> | 2016-08-25 16:48:03 -0500 |
|---|---|---|
| committer | Paul E. Murphy <murphyp@linux.vnet.ibm.com> | 2016-09-01 09:31:05 -0500 |
| commit | 847c9161c7745b7e15f841a1ec40fe11d5aae515 (patch) | |
| tree | 0dc92bd8c4cc8ea41d44583ccddba4fda037c0d7 /sysdeps | |
| parent | ee8a49071cba845b2ee5060b0d4238f9534b5ee3 (diff) | |
| download | glibc-847c9161c7745b7e15f841a1ec40fe11d5aae515.tar.gz glibc-847c9161c7745b7e15f841a1ec40fe11d5aae515.tar.xz glibc-847c9161c7745b7e15f841a1ec40fe11d5aae515.zip | |
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.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/aarch64/fpu/s_fmax.c | 2 | ||||
| -rw-r--r-- | sysdeps/aarch64/fpu/s_fmaxf.c | 2 | ||||
| -rw-r--r-- | sysdeps/aarch64/fpu/s_fminf.c | 2 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/math-type-macros-double.h | 1 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_fmax.c | 5 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_fmaxl.c | 5 |
6 files changed, 4 insertions, 13 deletions
diff --git a/sysdeps/aarch64/fpu/s_fmax.c b/sysdeps/aarch64/fpu/s_fmax.c index bc41ec44f6..c90de34e90 100644 --- a/sysdeps/aarch64/fpu/s_fmax.c +++ b/sysdeps/aarch64/fpu/s_fmax.c @@ -18,4 +18,4 @@ #define FUNC fmax #define INSN "fmaxnm" -#include <s_fmin.c> +#include <fpu/s_fmin.c> diff --git a/sysdeps/aarch64/fpu/s_fmaxf.c b/sysdeps/aarch64/fpu/s_fmaxf.c index 6a234bbeaf..fe9d4f35ba 100644 --- a/sysdeps/aarch64/fpu/s_fmaxf.c +++ b/sysdeps/aarch64/fpu/s_fmaxf.c @@ -20,4 +20,4 @@ #define INSN "fmaxnm" #define TYPE float #define REGS "s" -#include <s_fmin.c> +#include <fpu/s_fmin.c> diff --git a/sysdeps/aarch64/fpu/s_fminf.c b/sysdeps/aarch64/fpu/s_fminf.c index 78609575bb..97c9839595 100644 --- a/sysdeps/aarch64/fpu/s_fminf.c +++ b/sysdeps/aarch64/fpu/s_fminf.c @@ -19,4 +19,4 @@ #define FUNC fminf #define TYPE float #define REGS "s" -#include <s_fmin.c> +#include <fpu/s_fmin.c> diff --git a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h b/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h index e78a5e3589..808d2c5122 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 11e759121f..0000000000 --- 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 98221b2cdc..0000000000 --- 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); |