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 F33593858D28 for ; Sat, 5 Feb 2022 05:47:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F33593858D28 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 6FBEB342F9D; Sat, 5 Feb 2022 05:47:05 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 4/5] libgloss: merge iq2000 into top-level Makefile Date: Sat, 5 Feb 2022 00:46:55 -0500 Message-Id: <20220205054656.11443-5-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205054656.11443-1-vapier@gentoo.org> References: <20220205054656.11443-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Sat, 05 Feb 2022 05:47:07 -0000 Avoid a recursive make to speed things up a bit. --- libgloss/Makefile.am | 3 + libgloss/Makefile.in | 181 +++++++++++++++++++++++++++++---- libgloss/aclocal.m4 | 20 ++++ libgloss/configure | 189 +++++++++++++++++++++++++++++++---- libgloss/configure.ac | 7 +- libgloss/iq2000/Makefile.in | 149 --------------------------- libgloss/iq2000/Makefile.inc | 11 ++ 7 files changed, 368 insertions(+), 192 deletions(-) delete mode 100644 libgloss/iq2000/Makefile.in create mode 100644 libgloss/iq2000/Makefile.inc diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index 1209ec9d8d85..42d7b7ffb4b8 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -53,6 +53,9 @@ TEXINFO_TEX = ../texinfo/texinfo.tex if HAVE_DOC include doc/Makefile.inc endif +if CONFIG_IQ2000 +include iq2000/Makefile.inc +endif if CONFIG_LIBNOSYS include libnosys/Makefile.inc endif diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 1c04d92a44aa..21871f954444 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -207,8 +207,7 @@ case "${target}" in config_testsuite=false ;; iq2000-*-*) - AC_CONFIG_FILES([iq2000/Makefile]) - subdirs="$subdirs iq2000" + config_iq2000=true ;; or1k-*-* | or1knd-*-* ) AC_CONFIG_FILES([or1k/Makefile]) @@ -224,6 +223,8 @@ case "${target}" in ;; esac +AM_CONDITIONAL(CONFIG_IQ2000, test x$config_iq2000 = xtrue) + dnl For now, don't bother configuring testsuite dnl dnl if test "${config_testsuite}" = "true"; @@ -241,7 +242,7 @@ AC_SUBST(AR) LD=${LD-ld} AC_SUBST(LD) AC_PROG_RANLIB -LIB_AM_PROG_AS +AM_PROG_AS AC_DEFINE(HAVE_GNU_LD, 1, [Using GNU LD]) diff --git a/libgloss/iq2000/Makefile.inc b/libgloss/iq2000/Makefile.inc new file mode 100644 index 000000000000..97c91421cbed --- /dev/null +++ b/libgloss/iq2000/Makefile.inc @@ -0,0 +1,11 @@ +multilibtool_DATA += %D%/crt0.o %D%/sim.ld +multilibtool_LIBRARIES += %D%/libeval.a +libobjs_a_SOURCES += %D%/crt0.S %D%/test.o + +%C%_libeval_a_SOURCES = \ + %D%/_exit.c %D%/access.c %D%/chmod.c %D%/close.c %D%/crt1.c \ + %D%/fstat.c %D%/getpid.c %D%/gettime.c %D%/isatty.c \ + %D%/kill.c %D%/lseek.c %D%/open.c %D%/read.c \ + %D%/sbrk.c %D%/stat.c %D%/time.c %D%/trap.c %D%/unlink.c %D%/utime.c %D%/write.c + +check_PROGRAMS += %D%/test -- 2.34.1