diff mbox series

[v2] newlib: skip build of AArch64 80bit and 128bit long double functions when sizeof(double) == sizeof(long double)

Message ID GV4PR83MB09419CA212E6B591530E21389256A@GV4PR83MB0941.EURPRD83.prod.outlook.com
State New
Headers
Series [v2] newlib: skip build of AArch64 80bit and 128bit long double functions when sizeof(double) == sizeof(long double) |

Commit Message

Radek Barton July 16, 2025, 1:39 p.m. UTC 
  Hello.

Thank you for your insights.

As far as I understand it, the error originates from `newlib/libm/ld/invtrig.h` header, that does not seem to support/handle `__LDBL_MANT_DIG__ 53`, which is included in e.g. `newlib/libm/ld/e_asinl.c` file. This file is added to the build by `newlib/libm/ld/Makefile.inc` file which is included to `newlib/libm/Makefile.inc` based on `HAVE_FPMATH_H` macro. This macro is set by result of `test -r "${srcdir}/libc/machine/${machine_dir}/machine/_fpmath.h"` command.

It does not seem that the `_LDBL_EQ_DBL` macro is involved in the decision whether the affected implementations should be built or any similar decision throughout the codebase.

In context of this, should I interpret your insights that the test for `_LDBL_EQ_DBL` should be added to the `HAVE_FPMATH_H` condition as the following version of the patch demonstrates?

Thank you for any further explanation.

Radek

---

From 249b223435ac396cbe60443af51e8b79af64659b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Barto=C5=88?= <radek.barton@microsoft.com>
Date: Wed, 16 Jul 2025 14:56:19 +0200
Subject: [PATCH v2] newlib: skip build of AArch64 80bit and 128bit long double
 functions when sizeof(double) == sizeof(long double)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On aarch64-pc-cygwin and aarch64-w64-mingw, sizeof(double) ==
sizeof(long double) == 64 bit. This situation is detected by the
configure and signaled with _LDBL_EQ_DBL macro.

This patch skips build of objects from newlib/libm/ld/Makefile.inc when
this macro is set.

The newlib/Makefile.in file was updated using autoreconf-2.69 command.

Signed-off-by: Martin Vejbora <martin.vejbora@microsoft.com>
Co-authored-by: Radek Barton <radek.barton@microsoft.com>
---
 newlib/Makefile.in       | 255 +++++++++++++++++++--------------------
 newlib/configure         |  15 ++-
 newlib/libc/acinclude.m4 |   2 +-
 newlib/libm/Makefile.inc |   4 +-
 4 files changed, 144 insertions(+), 132 deletions(-)

Comments

Radek Barton July 21, 2025, 7:19 a.m. UTC | #1 
Hello.

Is there any further feedback on the second version of the patch? As far as I understand it, it does not make sense to build implementations in `aarch64/ld` folder at all if `_LDBL_EQ_DBL` is defined. Is that assumption correct?

Thank you.

Radek
Corinna Vinschen July 21, 2025, 11:28 a.m. UTC | #2 
On Jul 21 07:19, Radek Barton via Newlib wrote:
> Hello.
> 
> Is there any further feedback on the second version of the patch? As
> far as I understand it, it does not make sense to build
> implementations in `aarch64/ld` folder at all if `_LDBL_EQ_DBL` is
> defined. Is that assumption correct?

IIUC, sizeof(double) == sizeof(long double), right?

If so, _LDBL_EQ_DBL should be set and the long double functions
are automatically mapped to the double functions.


Corinna
Corinna Vinschen July 21, 2025, 11:32 a.m. UTC | #3 
On Jul 21 13:28, Corinna Vinschen wrote:
> On Jul 21 07:19, Radek Barton via Newlib wrote:
> > Hello.
> > 
> > Is there any further feedback on the second version of the patch? As
> > far as I understand it, it does not make sense to build
> > implementations in `aarch64/ld` folder at all if `_LDBL_EQ_DBL` is
> > defined. Is that assumption correct?
> 
> IIUC, sizeof(double) == sizeof(long double), right?
> 
> If so, _LDBL_EQ_DBL should be set and the long double functions
> are automatically mapped to the double functions.

So, if I'm not completely off-track, you should just define _LDBL_EQ_DBL
for the aarch64-pc-cygwin target.


Corinna
Corinna Vinschen July 21, 2025, 11:39 a.m. UTC | #4 
On Jul 21 13:32, Corinna Vinschen wrote:
> On Jul 21 13:28, Corinna Vinschen wrote:
> > On Jul 21 07:19, Radek Barton via Newlib wrote:
> > > Hello.
> > > 
> > > Is there any further feedback on the second version of the patch? As
> > > far as I understand it, it does not make sense to build
> > > implementations in `aarch64/ld` folder at all if `_LDBL_EQ_DBL` is
> > > defined. Is that assumption correct?
> > 
> > IIUC, sizeof(double) == sizeof(long double), right?
> > 
> > If so, _LDBL_EQ_DBL should be set and the long double functions
> > are automatically mapped to the double functions.
> 
> So, if I'm not completely off-track, you should just define _LDBL_EQ_DBL
> for the aarch64-pc-cygwin target.

Wait... shouldn't that have happened automatically?

configure.ac contains the following statement:

    AC_CACHE_CHECK(whether long double equals double,
		   newlib_cv_ldbl_eq_dbl, [dnl
    cat > conftest.c <<EOF
    #include <float.h>
    #if DBL_MANT_DIG == LDBL_MANT_DIG  &&  LDBL_MIN_EXP == DBL_MIN_EXP  && \
	LDBL_MAX_EXP == DBL_MAX_EXP
      #define _LDBL_EQ_DBL
     #else
      #error "LDBL != DBL"
    #endif
    EOF

So the configury should have already fixed that, right?


Corinna
Radek Barton July 21, 2025, 11:47 a.m. UTC | #5 
Hello.

> So, if I'm not completely off-track, you should just define _LDBL_EQ_DBL
> for the aarch64-pc-cygwin target.

The `_LDBL_EQ_DBL` macro is correctly set by the `configure` even without changes from my patch. The merit of patch is to skip build of source codes in `newlib-cygwin/newlib/libm/ld` folder based on the presence of that macro because it seems that those implementations are relevant only to the cases where `sizeof(double) != sizeof(long double)`. Alternatively, I can add checks to `_LDBL_EQ_DBL` macro to every single file in that folder but that would effectively have the same effect for the majority of the implementations, as far as I understand it.

Radek
Corinna Vinschen July 22, 2025, 11 a.m. UTC | #6 
On Jul 21 11:47, Radek Barton via Newlib wrote:
> Hello.
> 
> > So, if I'm not completely off-track, you should just define _LDBL_EQ_DBL
> > for the aarch64-pc-cygwin target.
> 
> The `_LDBL_EQ_DBL` macro is correctly set by the `configure` even
> without changes from my patch. The merit of patch is to skip build of
> source codes in `newlib-cygwin/newlib/libm/ld` folder based on the
> presence of that macro because it seems that those implementations are
> relevant only to the cases where `sizeof(double) != sizeof(long
> double)`. Alternatively, I can add checks to `_LDBL_EQ_DBL` macro to
> every single file in that folder but that would effectively have the
> same effect for the majority of the implementations, as far as I
> understand it.

No, sorry, I didn't quite get that, apparently.  This sounds like a 
good idea to me.  If the files are unused anyway, why build them at
all?

Craig, since you seem to have a better grasp of the math part in newlib,
what do you think?

Thanks,
Corinna
diff mbox series

Patch

diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index c5492c6b6..a46556284 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -797,7 +797,7 @@  check_PROGRAMS =
 @HAVE_LIBC_MACHINE_M88K_TRUE@am__append_94 = libc/machine/m88k/setjmp.S
 @HAVE_LIBC_MACHINE_MEP_TRUE@am__append_95 = libc/machine/mep/setjmp.S
 @HAVE_LIBC_MACHINE_MICROBLAZE_TRUE@am__append_96 = libc/machine/microblaze/strlen.c libc/machine/microblaze/strcmp.c libc/machine/microblaze/strcpy.c libc/machine/microblaze/setjmp.S libc/machine/microblaze/longjmp.S
-@HAVE_LIBC_MACHINE_MIPS_TRUE@am__append_97 = libc/machine/mips/setjmp.S libc/machine/mips/strlen.c libc/machine/mips/strcmp.S libc/machine/mips/strncpy.c libc/machine/mips/memset.S libc/machine/mips/memcpy.S
+@HAVE_LIBC_MACHINE_MIPS_TRUE@am__append_97 = libc/machine/mips/setjmp.S libc/machine/mips/strlen.c libc/machine/mips/strcmp.S libc/machine/mips/strncpy.c libc/machine/mips/memset.c libc/machine/mips/memcpy.c
 @HAVE_LIBC_MACHINE_MN10200_TRUE@am__append_98 = libc/machine/mn10200/setjmp.S
 @HAVE_LIBC_MACHINE_MN10300_TRUE@am__append_99 = \
 @HAVE_LIBC_MACHINE_MN10300_TRUE@	libc/machine/mn10300/setjmp.S libc/machine/mn10300/memchr.S libc/machine/mn10300/memcmp.S libc/machine/mn10300/memcpy.S libc/machine/mn10300/memset.S libc/machine/mn10300/strchr.S \
@@ -970,9 +970,9 @@  check_PROGRAMS =
 
 @NEWLIB_HW_FP_FALSE@am__append_138 = libm/math/math.tex
 @HAVE_LONG_DOUBLE_TRUE@am__append_139 = $(libm_common_lsrc)
-@HAVE_FPMATH_H_TRUE@@HAVE_LONG_DOUBLE_TRUE@am__append_140 = $(libm_ld_lsrc)
-@HAVE_FPMATH_H_TRUE@am__append_141 = 
-@HAVE_FPMATH_H_TRUE@am__append_142 = 
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@@HAVE_LONG_DOUBLE_TRUE@am__append_140 = $(libm_ld_lsrc)
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@am__append_141 = 
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@am__append_142 = 
 @HAVE_LIBM_MACHINE_AARCH64_TRUE@am__append_143 = $(libm_machine_aarch64_src)
 @HAVE_LIBM_MACHINE_AARCH64_TRUE@@HAVE_LONG_DOUBLE_TRUE@am__append_144 = $(libm_ld128_lsrc)
 @HAVE_LIBM_MACHINE_AARCH64_TRUE@am__append_145 = 
@@ -3086,54 +3086,52 @@  am__objects_152 = libm/common/libm_a-atanl.$(OBJEXT) \
 	libm/common/libm_a-log2l.$(OBJEXT) \
 	libm/common/libm_a-sl_finite.$(OBJEXT)
 @HAVE_LONG_DOUBLE_TRUE@am__objects_153 = $(am__objects_152)
-@HAVE_FPMATH_H_TRUE@am__objects_154 =  \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_acoshl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_acosl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_asinl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_atan2l.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_atanhl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_coshl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_fmodl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_lgammal.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_remainderl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-e_sinhl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_asinhl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_atanl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_cbrtl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_ceill.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_copysignl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_cosl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_fabsl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-fdiml.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_floorl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_fmal.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_fmaxl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_fminl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_frexpl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_ilogbl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_llrintl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_llroundl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_logbl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_lrint.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_lrintl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_lround.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_lroundl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_modfl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_nearbyintl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_nextafterl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_nexttoward.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_nexttowardf.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_remquol.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_rintl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_roundl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-scalblnl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_scalbnl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_sinl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_tanhl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_tanl.$(OBJEXT) \
-@HAVE_FPMATH_H_TRUE@	libm/ld/libm_a-s_truncl.$(OBJEXT)
-@HAVE_FPMATH_H_TRUE@@HAVE_LONG_DOUBLE_TRUE@am__objects_155 =  \
-@HAVE_FPMATH_H_TRUE@@HAVE_LONG_DOUBLE_TRUE@	$(am__objects_154)
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@am__objects_154 = libm/ld/libm_a-e_acoshl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_acosl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_asinl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_atan2l.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_atanhl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_coshl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_fmodl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_lgammal.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_remainderl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-e_sinhl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_asinhl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_atanl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_cbrtl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_ceill.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_copysignl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_cosl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_fabsl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-fdiml.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_floorl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_fmal.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_fmaxl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_fminl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_frexpl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_ilogbl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_llrintl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_llroundl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_logbl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_lrint.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_lrintl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_lround.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_lroundl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_modfl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_nearbyintl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_nextafterl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_nexttoward.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_nexttowardf.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_remquol.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_rintl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_roundl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-scalblnl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_scalbnl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_sinl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_tanhl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_tanl.$(OBJEXT) \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/libm_a-s_truncl.$(OBJEXT)
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@@HAVE_LONG_DOUBLE_TRUE@am__objects_155 = $(am__objects_154)
 am__objects_156 = libm/complex/libm_a-cabs.$(OBJEXT) \
 	libm/complex/libm_a-cacos.$(OBJEXT) \
 	libm/complex/libm_a-cacosh.$(OBJEXT) \
@@ -4006,6 +4004,7 @@  pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 shared_machine_dir = @shared_machine_dir@
 sharedstatedir = @sharedstatedir@
@@ -4898,54 +4897,54 @@  libm_common_lsrc = \
 	libm/common/sl_finite.c
 
 libm_a_CFLAGS_libm_common = -fbuiltin -fno-math-errno
-@HAVE_FPMATH_H_TRUE@libm_ld_lsrc = \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_acoshl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_acosl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_asinl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_atan2l.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_atanhl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_coshl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_fmodl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_lgammal.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_remainderl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/e_sinhl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_asinhl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_atanl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_cbrtl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_ceill.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_copysignl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_cosl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_fabsl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/fdiml.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_floorl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_fmal.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_fmaxl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_fminl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_frexpl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_ilogbl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_llrintl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_llroundl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_logbl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_lrint.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_lrintl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_lround.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_lroundl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_modfl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_nearbyintl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_nextafterl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_nexttoward.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_nexttowardf.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_remquol.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_rintl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_roundl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/scalblnl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_scalbnl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_sinl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_tanhl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_tanl.c \
-@HAVE_FPMATH_H_TRUE@	libm/ld/s_truncl.c
-
-@HAVE_FPMATH_H_TRUE@libm_a_CFLAGS_libm_ld = -fbuiltin -fno-math-errno
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@libm_ld_lsrc = \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_acoshl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_acosl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_asinl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_atan2l.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_atanhl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_coshl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_fmodl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_lgammal.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_remainderl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/e_sinhl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_asinhl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_atanl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_cbrtl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_ceill.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_copysignl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_cosl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_fabsl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/fdiml.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_floorl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_fmal.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_fmaxl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_fminl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_frexpl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_ilogbl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_llrintl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_llroundl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_logbl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_lrint.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_lrintl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_lround.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_lroundl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_modfl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_nearbyintl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_nextafterl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_nexttoward.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_nexttowardf.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_remquol.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_rintl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_roundl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/scalblnl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_scalbnl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_sinl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_tanhl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_tanl.c \
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@	libm/ld/s_truncl.c
+
+@HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE@libm_a_CFLAGS_libm_ld = -fbuiltin -fno-math-errno
 libm_complex_src = \
 	libm/complex/cabs.c libm/complex/cacos.c libm/complex/cacosh.c libm/complex/carg.c libm/complex/casin.c libm/complex/casinh.c \
 	libm/complex/catan.c libm/complex/catanh.c libm/complex/ccos.c libm/complex/ccosh.c libm/complex/cephes_subr.c \
@@ -18850,34 +18849,6 @@  libc/machine/mips/libc_a-strcmp.obj: libc/machine/mips/strcmp.S
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o libc/machine/mips/libc_a-strcmp.obj `if test -f 'libc/machine/mips/strcmp.S'; then $(CYGPATH_W) 'libc/machine/mips/strcmp.S'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/strcmp.S'; fi`
 
-libc/machine/mips/libc_a-memset.o: libc/machine/mips/memset.S
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -MT libc/machine/mips/libc_a-memset.o -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo -c -o libc/machine/mips/libc_a-memset.o `test -f 'libc/machine/mips/memset.S' || echo '$(srcdir)/'`libc/machine/mips/memset.S
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memset.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='libc/machine/mips/memset.c' object='libc/machine/mips/libc_a-memset.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o libc/machine/mips/libc_a-memset.o `test -f 'libc/machine/mips/memset.S' || echo '$(srcdir)/'`libc/machine/mips/memset.S
-
-libc/machine/mips/libc_a-memset.obj: libc/machine/mips/memset.S
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -MT libc/machine/mips/libc_a-memset.obj -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo -c -o libc/machine/mips/libc_a-memset.obj `if test -f 'libc/machine/mips/memset.S'; then $(CYGPATH_W) 'libc/machine/mips/memset.S'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memset.S'; fi`
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memset.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='libc/machine/mips/memset.c' object='libc/machine/mips/libc_a-memset.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o libc/machine/mips/libc_a-memset.obj `if test -f 'libc/machine/mips/memset.S'; then $(CYGPATH_W) 'libc/machine/mips/memset.S'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memset.S'; fi`
-
-libc/machine/mips/libc_a-memcpy.o: libc/machine/mips/memcpy.S
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -MT libc/machine/mips/libc_a-memcpy.o -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo -c -o libc/machine/mips/libc_a-memcpy.o `test -f 'libc/machine/mips/memcpy.S' || echo '$(srcdir)/'`libc/machine/mips/memcpy.S
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='libc/machine/mips/memcpy.c' object='libc/machine/mips/libc_a-memcpy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o libc/machine/mips/libc_a-memcpy.o `test -f 'libc/machine/mips/memcpy.S' || echo '$(srcdir)/'`libc/machine/mips/memcpy.S
-
-libc/machine/mips/libc_a-memcpy.obj: libc/machine/mips/memcpy.S
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -MT libc/machine/mips/libc_a-memcpy.obj -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo -c -o libc/machine/mips/libc_a-memcpy.obj `if test -f 'libc/machine/mips/memcpy.S'; then $(CYGPATH_W) 'libc/machine/mips/memcpy.S'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memcpy.S'; fi`
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='libc/machine/mips/memcpy.c' object='libc/machine/mips/libc_a-memcpy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o libc/machine/mips/libc_a-memcpy.obj `if test -f 'libc/machine/mips/memcpy.S'; then $(CYGPATH_W) 'libc/machine/mips/memcpy.S'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memcpy.S'; fi`
-
 libc/machine/mn10200/libc_a-setjmp.o: libc/machine/mn10200/setjmp.S
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAGS) -MT libc/machine/mn10200/libc_a-setjmp.o -MD -MP -MF libc/machine/mn10200/$(DEPDIR)/libc_a-setjmp.Tpo -c -o libc/machine/mn10200/libc_a-setjmp.o `test -f 'libc/machine/mn10200/setjmp.S' || echo '$(srcdir)/'`libc/machine/mn10200/setjmp.S
 @am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mn10200/$(DEPDIR)/libc_a-setjmp.Tpo libc/machine/mn10200/$(DEPDIR)/libc_a-setjmp.Po
@@ -34182,6 +34153,34 @@  libc/machine/mips/libc_a-strncpy.obj: libc/machine/mips/strncpy.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/mips/libc_a-strncpy.obj `if test -f 'libc/machine/mips/strncpy.c'; then $(CYGPATH_W) 'libc/machine/mips/strncpy.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/strncpy.c'; fi`
 
+libc/machine/mips/libc_a-memset.o: libc/machine/mips/memset.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/mips/libc_a-memset.o -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo -c -o libc/machine/mips/libc_a-memset.o `test -f 'libc/machine/mips/memset.c' || echo '$(srcdir)/'`libc/machine/mips/memset.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memset.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libc/machine/mips/memset.c' object='libc/machine/mips/libc_a-memset.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/mips/libc_a-memset.o `test -f 'libc/machine/mips/memset.c' || echo '$(srcdir)/'`libc/machine/mips/memset.c
+
+libc/machine/mips/libc_a-memset.obj: libc/machine/mips/memset.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/mips/libc_a-memset.obj -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo -c -o libc/machine/mips/libc_a-memset.obj `if test -f 'libc/machine/mips/memset.c'; then $(CYGPATH_W) 'libc/machine/mips/memset.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memset.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memset.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memset.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libc/machine/mips/memset.c' object='libc/machine/mips/libc_a-memset.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/mips/libc_a-memset.obj `if test -f 'libc/machine/mips/memset.c'; then $(CYGPATH_W) 'libc/machine/mips/memset.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memset.c'; fi`
+
+libc/machine/mips/libc_a-memcpy.o: libc/machine/mips/memcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/mips/libc_a-memcpy.o -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo -c -o libc/machine/mips/libc_a-memcpy.o `test -f 'libc/machine/mips/memcpy.c' || echo '$(srcdir)/'`libc/machine/mips/memcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libc/machine/mips/memcpy.c' object='libc/machine/mips/libc_a-memcpy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/mips/libc_a-memcpy.o `test -f 'libc/machine/mips/memcpy.c' || echo '$(srcdir)/'`libc/machine/mips/memcpy.c
+
+libc/machine/mips/libc_a-memcpy.obj: libc/machine/mips/memcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/mips/libc_a-memcpy.obj -MD -MP -MF libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo -c -o libc/machine/mips/libc_a-memcpy.obj `if test -f 'libc/machine/mips/memcpy.c'; then $(CYGPATH_W) 'libc/machine/mips/memcpy.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memcpy.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Tpo libc/machine/mips/$(DEPDIR)/libc_a-memcpy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libc/machine/mips/memcpy.c' object='libc/machine/mips/libc_a-memcpy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/mips/libc_a-memcpy.obj `if test -f 'libc/machine/mips/memcpy.c'; then $(CYGPATH_W) 'libc/machine/mips/memcpy.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/mips/memcpy.c'; fi`
+
 libc/machine/msp430/libc_a-tiny-puts.o: libc/machine/msp430/tiny-puts.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/msp430/libc_a-tiny-puts.o -MD -MP -MF libc/machine/msp430/$(DEPDIR)/libc_a-tiny-puts.Tpo -c -o libc/machine/msp430/libc_a-tiny-puts.o `test -f 'libc/machine/msp430/tiny-puts.c' || echo '$(srcdir)/'`libc/machine/msp430/tiny-puts.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libc/machine/msp430/$(DEPDIR)/libc_a-tiny-puts.Tpo libc/machine/msp430/$(DEPDIR)/libc_a-tiny-puts.Po
diff --git a/newlib/configure b/newlib/configure
index 33a2ed1c5..2a34c03d4 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -637,6 +637,8 @@  HAS_NDS32_FPU_SP_FALSE
 HAS_NDS32_FPU_SP_TRUE
 MACH_ADD_SETJMP_FALSE
 MACH_ADD_SETJMP_TRUE
+HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_FALSE
+HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE
 HAVE_FPMATH_H_FALSE
 HAVE_FPMATH_H_TRUE
 HAVE_LIBC_MACHINE_Z8K_FALSE
@@ -1696,7 +1698,7 @@  Optional Features:
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
+                          enable make rules and dependencies not useful
 (and
                           sometimes confusing) to the casual installer
   --enable-dependency-tracking
                           do not reject slow dependency extractors
@@ -6206,6 +6208,13 @@  else
   HAVE_FPMATH_H_FALSE=
 fi
 
+ if test "$HAVE_FPMATH_H" = "yes" && test "$_LDBL_EQ_DBL" != "yes"; then
+  HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE=
+  HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_FALSE='#'
+else
+  HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE='#'
+  HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_FALSE=
+fi
 
 
  if test "x$mach_add_setjmp" = "xtrue"; then
@@ -8061,6 +8070,10 @@  if test -z "${HAVE_FPMATH_H_TRUE}" && test -z "${HAVE_FPMATH_H_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_FPMATH_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_TRUE}" && test -z "${HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MACH_ADD_SETJMP_TRUE}" && test -z "${MACH_ADD_SETJMP_FALSE}"; then
   as_fn_error $? "conditional \"MACH_ADD_SETJMP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/newlib/libc/acinclude.m4 b/newlib/libc/acinclude.m4
index 52a6c57cf..3c7660401 100644
--- a/newlib/libc/acinclude.m4
+++ b/newlib/libc/acinclude.m4
@@ -64,6 +64,6 @@  m4_foreach_w([MACHINE], [
 ], [AM_CONDITIONAL([HAVE_LIBC_MACHINE_]m4_toupper(MACHINE), test "${machine_dir}" = MACHINE)])
 
 AM_CONDITIONAL(HAVE_FPMATH_H, test -r "${srcdir}/libc/machine/${machine_dir}/machine/_fpmath.h")
-
+AM_CONDITIONAL(HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL, test "$HAVE_FPMATH_H" = "yes" && test "$_LDBL_EQ_DBL" != "yes")
 
 AM_CONDITIONAL(MACH_ADD_SETJMP, test "x$mach_add_setjmp" = "xtrue")
diff --git a/newlib/libm/Makefile.inc b/newlib/libm/Makefile.inc
index bf31b1be7..c3aa7dee4 100644
--- a/newlib/libm/Makefile.inc
+++ b/newlib/libm/Makefile.inc
@@ -45,9 +45,9 @@  include %D%/math/Makefile.inc
 endif
 include %D%/common/Makefile.inc
 
-if HAVE_FPMATH_H
+if HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL
 include %D%/ld/Makefile.inc
-endif # HAVE_FPMATH_H
+endif # HAVE_FPMATH_H_AND_NOT_LDBL_EQ_DBL
 
 include %D%/complex/Makefile.inc
 include %D%/fenv/Makefile.inc