From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vapier@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1521)
 id 6D7D63948437; Fri, 28 Jan 2022 12:28:33 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6D7D63948437
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: hoist crt0 install up another dir
X-Act-Checkin: newlib-cygwin
X-Git-Author: Mike Frysinger <vapier@gentoo.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 9d3352416413817b37b13277cb44308651c42121
X-Git-Newrev: 7a4bef590b37683b08ebaee384d0694b9afccc57
Message-Id: <20220128122833.6D7D63948437@sourceware.org>
Date: Fri, 28 Jan 2022 12:28:33 +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: Fri, 28 Jan 2022 12:28:33 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D7a4bef590b3=
7683b08ebaee384d0694b9afccc57

commit 7a4bef590b37683b08ebaee384d0694b9afccc57
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Jan 28 07:24:18 2022 -0500

    newlib: hoist crt0 install up another dir
   =20
    Commit dd23de27c8e45513ad276f503a0036c3bc4e487b ("newlib: libc: install
    CRT0 straight out of subdir") got rid of the libc/sys/ intermediate for
    copying the file up, but the top-level newlib/ dir was still expecting
    a libc/crt0.o to exist so it could install.  Update that to also look
    for the crt0 file directly under libc/ like we already do for crt1.

Diff:
---
 newlib/configure    | 2 +-
 newlib/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/newlib/configure b/newlib/configure
index 9bbb089a9..31b790f2a 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -12442,7 +12442,7 @@ CRT0=3D
 CRT0_DIR=3D
 if test "x${have_crt0}" =3D "xyes"; then
   CRT0=3Dcrt0.o
-  CRT0_DIR=3Dlibc/
+  CRT0_DIR=3Dlibc/sys/${sys_dir}/
 fi
  if test x$have_crt0 =3D xyes; then
   HAVE_CRT0_TRUE=3D
diff --git a/newlib/configure.ac b/newlib/configure.ac
index 13f318922..cac2d7296 100644
--- a/newlib/configure.ac
+++ b/newlib/configure.ac
@@ -361,7 +361,7 @@ CRT0=3D
 CRT0_DIR=3D
 if test "x${have_crt0}" =3D "xyes"; then
   CRT0=3Dcrt0.o
-  CRT0_DIR=3Dlibc/
+  CRT0_DIR=3Dlibc/sys/${sys_dir}/
 fi
 AM_CONDITIONAL(HAVE_CRT0, test x$have_crt0 =3D xyes)
 AC_SUBST(CRT0)