From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 2C93D3858C1F; Wed, 16 Feb 2022 00:59:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C93D3858C1F Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: phoenix: move some logic from configure to the Makefile X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: ec69debcb977d6395f9e91ee20133de473484e20 X-Git-Newrev: 5a6bf1749faeadc42f29e4f4be8defc957e84484 Message-Id: <20220216005923.2C93D3858C1F@sourceware.org> Date: Wed, 16 Feb 2022 00:59:23 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2022 00:59:23 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D5a6bf1749fa= eadc42f29e4f4be8defc957e84484 commit 5a6bf1749faeadc42f29e4f4be8defc957e84484 Author: Mike Frysinger Date: Thu Feb 10 01:38:17 2022 -0500 newlib: phoenix: move some logic from configure to the Makefile =20 These configure scripts hardcode some settings, so move them to the Makefile to simplify so we can drop the configure scripts entirely. Diff: --- newlib/libc/sys/phoenix/Makefile.am | 2 ++ newlib/libc/sys/phoenix/Makefile.in | 2 +- newlib/libc/sys/phoenix/configure | 4 ---- newlib/libc/sys/phoenix/configure.ac | 3 --- newlib/libc/sys/phoenix/machine/Makefile.am | 2 ++ newlib/libc/sys/phoenix/machine/Makefile.in | 2 +- newlib/libc/sys/phoenix/machine/configure | 7 ------- newlib/libc/sys/phoenix/machine/configure.ac | 6 ------ 8 files changed, 6 insertions(+), 22 deletions(-) diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/= Makefile.am index 49647c207..d6c32e734 100644 --- a/newlib/libc/sys/phoenix/Makefile.am +++ b/newlib/libc/sys/phoenix/Makefile.am @@ -4,6 +4,8 @@ AM_CPPFLAGS =3D -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROS= S_CFLAGS) $(TARGET_CFLA =20 SUBDIRS =3D machine =20 +PHOENIX_MACH_LIB =3D machine/lib.a + SUBLIBS =3D \ $(PHOENIX_MACH_LIB) =20 diff --git a/newlib/libc/sys/phoenix/Makefile.in b/newlib/libc/sys/phoenix/= Makefile.in index ba33e6b36..c7a043fc2 100644 --- a/newlib/libc/sys/phoenix/Makefile.in +++ b/newlib/libc/sys/phoenix/Makefile.in @@ -271,7 +271,6 @@ PACKAGE_TARNAME =3D @PACKAGE_TARNAME@ PACKAGE_URL =3D @PACKAGE_URL@ PACKAGE_VERSION =3D @PACKAGE_VERSION@ PATH_SEPARATOR =3D @PATH_SEPARATOR@ -PHOENIX_MACH_LIB =3D @PHOENIX_MACH_LIB@ RANLIB =3D @RANLIB@ READELF =3D @READELF@ SET_MAKE =3D @SET_MAKE@ @@ -337,6 +336,7 @@ top_builddir =3D @top_builddir@ top_srcdir =3D @top_srcdir@ AM_CPPFLAGS =3D -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TAR= GET_CFLAGS) $(INCLTDL) SUBDIRS =3D machine +PHOENIX_MACH_LIB =3D machine/lib.a SUBLIBS =3D \ $(PHOENIX_MACH_LIB) =20 diff --git a/newlib/libc/sys/phoenix/configure b/newlib/libc/sys/phoenix/co= nfigure index 0231cdb45..f24ef05cd 100644 --- a/newlib/libc/sys/phoenix/configure +++ b/newlib/libc/sys/phoenix/configure @@ -588,7 +588,6 @@ ac_subst_vars=3D'am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -PHOENIX_MACH_LIB subdirs sys_dir shared_machine_dir @@ -4265,9 +4264,6 @@ OBJEXT=3Do subdirs=3D"$subdirs machine" =20 =20 -PHOENIX_MACH_LIB=3Dmachine/lib.a - - ac_config_files=3D"$ac_config_files Makefile" =20 cat >confcache <<\_ACEOF diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix= /configure.ac index 55793f7a9..9d64b9d25 100644 --- a/newlib/libc/sys/phoenix/configure.ac +++ b/newlib/libc/sys/phoenix/configure.ac @@ -11,8 +11,5 @@ NEWLIB_CONFIGURE(../../..) =20 AC_CONFIG_SUBDIRS(machine) =20 -PHOENIX_MACH_LIB=3Dmachine/lib.a -AC_SUBST(PHOENIX_MACH_LIB) - AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/newlib/libc/sys/phoenix/machine/Makefile.am b/newlib/libc/sys/= phoenix/machine/Makefile.am index 06c2509a2..793d011be 100644 --- a/newlib/libc/sys/phoenix/machine/Makefile.am +++ b/newlib/libc/sys/phoenix/machine/Makefile.am @@ -2,6 +2,8 @@ =20 SUBDIRS =3D $(machine_dir) . =20 +CRT0 =3D crt0.o + noinst_DATA =3D $(CRT0) lib.a =20 $(CRT0): $(machine_dir)/$(CRT0) diff --git a/newlib/libc/sys/phoenix/machine/Makefile.in b/newlib/libc/sys/= phoenix/machine/Makefile.in index bc00576e8..ecebd8b2f 100644 --- a/newlib/libc/sys/phoenix/machine/Makefile.in +++ b/newlib/libc/sys/phoenix/machine/Makefile.in @@ -175,7 +175,6 @@ CCASFLAGS =3D @CCASFLAGS@ CFLAGS =3D @CFLAGS@ CPP =3D @CPP@ CPPFLAGS =3D @CPPFLAGS@ -CRT0 =3D @CRT0@ CYGPATH_W =3D @CYGPATH_W@ DEFS =3D @DEFS@ ECHO_C =3D @ECHO_C@ @@ -269,6 +268,7 @@ top_build_prefix =3D @top_build_prefix@ top_builddir =3D @top_builddir@ top_srcdir =3D @top_srcdir@ SUBDIRS =3D $(machine_dir) . +CRT0 =3D crt0.o noinst_DATA =3D $(CRT0) lib.a CLEANFILES =3D $(CRT0) ACLOCAL_AMFLAGS =3D -I ../../../.. -I ../../../../.. -I ../../../../../con= fig diff --git a/newlib/libc/sys/phoenix/machine/configure b/newlib/libc/sys/ph= oenix/machine/configure index d516e11ef..8d7fde54d 100644 --- a/newlib/libc/sys/phoenix/machine/configure +++ b/newlib/libc/sys/phoenix/machine/configure @@ -590,7 +590,6 @@ LTLIBOBJS LIBOBJS HAVE_MACHINE_DIR_FALSE HAVE_MACHINE_DIR_TRUE -CRT0 subdirs sys_dir shared_machine_dir @@ -4280,12 +4279,6 @@ subdirs=3D"$subdirs arm" esac; fi =20 -CRT0=3D -if test -n "${machine_dir}"; then - CRT0=3Dcrt0.o -fi - - if test x${machine_dir} !=3D x; then HAVE_MACHINE_DIR_TRUE=3D HAVE_MACHINE_DIR_FALSE=3D'#' diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys= /phoenix/machine/configure.ac index f3f7c79bc..05dd0f8e4 100644 --- a/newlib/libc/sys/phoenix/machine/configure.ac +++ b/newlib/libc/sys/phoenix/machine/configure.ac @@ -18,12 +18,6 @@ if test -n "${machine_dir}"; then esac; fi =20 -CRT0=3D -if test -n "${machine_dir}"; then - CRT0=3Dcrt0.o -fi -AC_SUBST(CRT0) - AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} !=3D x) =20 AC_CONFIG_FILES([Makefile])