From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vapier@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1521)
 id CBA353858D1E; Thu, 10 Feb 2022 05:37:46 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBA353858D1E
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Michael Frysinger <vapier@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] newlib: libm: fix rebase conflicts
X-Act-Checkin: newlib-cygwin
X-Git-Author: Mike Frysinger <vapier@gentoo.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: e114cbc6e1765a5a0b53921fe09948a2b4031dee
X-Git-Newrev: e95c80b6d82b5f5aca578ae131faa6b7df965020
Message-Id: <20220210053746.CBA353858D1E@sourceware.org>
Date: Thu, 10 Feb 2022 05:37:46 +0000 (GMT)
X-BeenThere: newlib-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Newlib GIT logs <newlib-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/newlib-cvs>,
 <mailto:newlib-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/newlib-cvs/>
List-Help: <mailto:newlib-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/newlib-cvs>,
 <mailto:newlib-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Feb 2022 05:37:46 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De95c80b6d82=
b5f5aca578ae131faa6b7df965020

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

    newlib: libm: fix rebase conflicts
   =20
    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
=20
   LIBM_MACHINE_DIR=3Dmachine/${libm_machine_dir}
-  if test "${use_libtool}" =3D "yes"; then
-    LIBM_MACHINE_LIB=3D${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
-  else
-    LIBM_MACHINE_LIB=3D${LIBM_MACHINE_DIR}/lib.${aext}
-  fi
+  LIBM_MACHINE_LIB=3D${LIBM_MACHINE_DIR}/lib.a
 fi
  if test "x${LIBM_MACHINE_DIR}" !=3D x; then
   HAVE_LIBM_MACHINE_DIR_TRUE=3D
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
=20
   LIBM_MACHINE_DIR=3Dmachine/${libm_machine_dir}
-  if test "${use_libtool}" =3D "yes"; then
-    LIBM_MACHINE_LIB=3D${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
-  else
-    LIBM_MACHINE_LIB=3D${LIBM_MACHINE_DIR}/lib.${aext}
-  fi
+  LIBM_MACHINE_LIB=3D${LIBM_MACHINE_DIR}/lib.a
 fi
 AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" !=3D x)
 AC_SUBST(LIBM_MACHINE_DIR)