[newlib-cygwin] newlib: libm: fix rebase conflicts

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e95c80b6d82b5f5aca578ae131faa6b7df965020

commit e95c80b6d82b5f5aca578ae131faa6b7df965020
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Thu Feb 10 00:36:34 2022 -0500

    newlib: libm: fix rebase conflicts
    
    I missed this cleanup when rebasing on top of the latest branch.

Diff:
---
 newlib/configure         | 6 +-----
 newlib/libm/acinclude.m4 | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/newlib/configure b/newlib/configure
index aefb8c03a..aa944d2c2 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -4823,11 +4823,7 @@ if test -n "${libm_machine_dir}"; then
   esac
 
   LIBM_MACHINE_DIR=machine/${libm_machine_dir}
-  if test "${use_libtool}" = "yes"; then
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
-  else
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
-  fi
+  LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
 fi
  if test "x${LIBM_MACHINE_DIR}" != x; then
   HAVE_LIBM_MACHINE_DIR_TRUE=
diff --git a/newlib/libm/acinclude.m4 b/newlib/libm/acinclude.m4
index 25054dc8c..6b59715fc 100644
--- a/newlib/libm/acinclude.m4
+++ b/newlib/libm/acinclude.m4
@@ -20,11 +20,7 @@ if test -n "${libm_machine_dir}"; then
   esac
 
   LIBM_MACHINE_DIR=machine/${libm_machine_dir}
-  if test "${use_libtool}" = "yes"; then
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
-  else
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
-  fi
+  LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
 fi
 AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x)
 AC_SUBST(LIBM_MACHINE_DIR)