From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id B5D693858C60 for ; Thu, 10 Feb 2022 08:51:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B5D693858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 2DA28343068; Thu, 10 Feb 2022 08:51:28 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile Date: Thu, 10 Feb 2022 03:51:22 -0500 Message-Id: <20220210085126.21023-2-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220210085126.21023-1-vapier@gentoo.org> References: <20220210085126.21023-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2022 08:51:33 -0000 These configure scripts hardcode some settings, so move them to the Makefile to simplify so we can drop the configure scripts entirely. --- 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 49647c207544..d6c32e734e5b 100644 --- a/newlib/libc/sys/phoenix/Makefile.am +++ b/newlib/libc/sys/phoenix/Makefile.am @@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLA SUBDIRS = machine +PHOENIX_MACH_LIB = machine/lib.a + SUBLIBS = \ $(PHOENIX_MACH_LIB) diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac index 55793f7a98c0..9d64b9d258a2 100644 --- a/newlib/libc/sys/phoenix/configure.ac +++ b/newlib/libc/sys/phoenix/configure.ac @@ -11,8 +11,5 @@ NEWLIB_CONFIGURE(../../..) AC_CONFIG_SUBDIRS(machine) -PHOENIX_MACH_LIB=machine/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 06c2509a2aab..793d011bef30 100644 --- a/newlib/libc/sys/phoenix/machine/Makefile.am +++ b/newlib/libc/sys/phoenix/machine/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = $(machine_dir) . +CRT0 = crt0.o + noinst_DATA = $(CRT0) lib.a $(CRT0): $(machine_dir)/$(CRT0) diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac index f3f7c79bc1f5..05dd0f8e48b6 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 -CRT0= -if test -n "${machine_dir}"; then - CRT0=crt0.o -fi -AC_SUBST(CRT0) - AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x) AC_CONFIG_FILES([Makefile]) -- 2.34.1