From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vapier@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1521)
 id 2A1BF3858D20; Thu, 17 Feb 2022 01:41:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A1BF3858D20
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: fix mips fenv.o handling
X-Act-Checkin: newlib-cygwin
X-Git-Author: Mike Frysinger <vapier@gentoo.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: e0c0ad8268af60a2413edcab84320eef1e6ce5f9
X-Git-Newrev: beadbdfc048d6c4baa16cfae25d427797deb9feb
Message-Id: <20220217014114.2A1BF3858D20@sourceware.org>
Date: Thu, 17 Feb 2022 01:41:14 +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, 17 Feb 2022 01:41:14 -0000

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

commit beadbdfc048d6c4baa16cfae25d427797deb9feb
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Mon Feb 7 01:44:45 2022 -0500

    newlib: fix mips fenv.o handling
   =20
    Commit 8fa73a9f8414a4926365324c2fe32a237c2eb91d changed how fenv.c is
    compiled wrt mips16 targets used the wrong variable to add fenv.o to
    libm.a.  Fix that thinko so it's included in the build again.

Diff:
---
 newlib/libm/machine/mips/Makefile.am | 2 +-
 newlib/libm/machine/mips/Makefile.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/newlib/libm/machine/mips/Makefile.am b/newlib/libm/machine/mip=
s/Makefile.am
index ff29858be..e72cd764a 100644
--- a/newlib/libm/machine/mips/Makefile.am
+++ b/newlib/libm/machine/mips/Makefile.am
@@ -11,7 +11,7 @@ noinst_LIBRARIES =3D lib.a
 lib_a_SOURCES =3D $(LIB_SOURCES)
 lib_a_CFLAGS =3D $(AM_CFLAGS)
=20
-LIBADD_OBJS =3D \
+lib_a_LIBADD =3D \
 	lib_a-fenv.$(OBJEXT)
=20
 # fenv.c cannot be compiled as mips16 since it uses the cfc1 instruction
diff --git a/newlib/libm/machine/mips/Makefile.in b/newlib/libm/machine/mip=
s/Makefile.in
index 0868877bb..1f9fbce6f 100644
--- a/newlib/libm/machine/mips/Makefile.in
+++ b/newlib/libm/machine/mips/Makefile.in
@@ -111,7 +111,7 @@ am__v_AR_ =3D $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 =3D @echo "  AR      " $@;
 am__v_AR_1 =3D=20
 lib_a_AR =3D $(AR) $(ARFLAGS)
-lib_a_LIBADD =3D
+lib_a_DEPENDENCIES =3D lib_a-fenv.$(OBJEXT)
 am__objects_1 =3D lib_a-feclearexcept.$(OBJEXT) lib_a-fegetenv.$(OBJEXT) \
 	lib_a-fegetexceptflag.$(OBJEXT) lib_a-fegetround.$(OBJEXT) \
 	lib_a-feholdexcept.$(OBJEXT) lib_a-feraiseexcept.$(OBJEXT) \
@@ -305,7 +305,7 @@ LIB_SOURCES =3D \
 noinst_LIBRARIES =3D lib.a
 lib_a_SOURCES =3D $(LIB_SOURCES)
 lib_a_CFLAGS =3D $(AM_CFLAGS)
-LIBADD_OBJS =3D \
+lib_a_LIBADD =3D \
 	lib_a-fenv.$(OBJEXT)
=20
 all: all-am