From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 1CD4D385841B for ; Thu, 17 Feb 2022 05:04:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1CD4D385841B 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 98A0E342F12; Thu, 17 Feb 2022 05:04:10 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] newlib: libc: delete crt0.o duplication Date: Thu, 17 Feb 2022 00:04:08 -0500 Message-Id: <20220217050408.22442-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: Thu, 17 Feb 2022 05:04:15 -0000 The crt0.o was handled in a subdir-by-subdir basis: it would be compiled in one (e.g. libc/sys/$arch/), then copied up one level (libc/sys/), then copied up another (libc/) before finally being copied & installed in the top newlib dir. The libc/sys/ copy was cleaned up, and then the top dir was changed to copy it directly out of the libc/sys/$arch/ dir. But the libc/sys/ copy to libc/ was left behind. Clean that up now too. --- newlib/libc/Makefile.am | 10 ---------- newlib/libc/Makefile.in | 14 +------------- newlib/libc/argz/Makefile.in | 1 - newlib/libc/configure | 7 ------- newlib/libc/configure.ac | 6 ------ newlib/libc/ctype/Makefile.in | 1 - newlib/libc/errno/Makefile.in | 1 - newlib/libc/iconv/Makefile.in | 1 - newlib/libc/iconv/ccs/Makefile.in | 1 - newlib/libc/iconv/ccs/binary/Makefile.in | 1 - newlib/libc/iconv/ces/Makefile.in | 1 - newlib/libc/iconv/lib/Makefile.in | 1 - newlib/libc/locale/Makefile.in | 1 - newlib/libc/machine/a29k/Makefile.in | 1 - newlib/libc/machine/aarch64/Makefile.in | 1 - newlib/libc/machine/amdgcn/Makefile.in | 1 - newlib/libc/machine/arc/Makefile.in | 1 - newlib/libc/machine/arm/Makefile.in | 1 - newlib/libc/machine/bfin/Makefile.in | 1 - newlib/libc/machine/cr16/Makefile.in | 1 - newlib/libc/machine/cris/Makefile.in | 1 - newlib/libc/machine/crx/Makefile.in | 1 - newlib/libc/machine/csky/Makefile.in | 1 - newlib/libc/machine/d10v/Makefile.in | 1 - newlib/libc/machine/d30v/Makefile.in | 1 - newlib/libc/machine/epiphany/Makefile.in | 1 - newlib/libc/machine/fr30/Makefile.in | 1 - newlib/libc/machine/frv/Makefile.in | 1 - newlib/libc/machine/ft32/Makefile.in | 1 - newlib/libc/machine/h8300/Makefile.in | 1 - newlib/libc/machine/h8500/Makefile.in | 1 - newlib/libc/machine/hppa/Makefile.in | 1 - newlib/libc/machine/i386/Makefile.in | 1 - newlib/libc/machine/i960/Makefile.in | 1 - newlib/libc/machine/iq2000/Makefile.in | 1 - newlib/libc/machine/lm32/Makefile.in | 1 - newlib/libc/machine/m32c/Makefile.in | 1 - newlib/libc/machine/m32r/Makefile.in | 1 - newlib/libc/machine/m68hc11/Makefile.in | 1 - newlib/libc/machine/m68k/Makefile.in | 1 - newlib/libc/machine/m88k/Makefile.in | 1 - newlib/libc/machine/mep/Makefile.in | 1 - newlib/libc/machine/microblaze/Makefile.in | 1 - newlib/libc/machine/mips/Makefile.in | 1 - newlib/libc/machine/mn10200/Makefile.in | 1 - newlib/libc/machine/mn10300/Makefile.in | 1 - newlib/libc/machine/moxie/Makefile.in | 1 - newlib/libc/machine/msp430/Makefile.in | 1 - newlib/libc/machine/mt/Makefile.in | 1 - newlib/libc/machine/nds32/Makefile.in | 1 - newlib/libc/machine/necv70/Makefile.in | 1 - newlib/libc/machine/nios2/Makefile.in | 1 - newlib/libc/machine/nvptx/Makefile.in | 1 - newlib/libc/machine/or1k/Makefile.in | 1 - newlib/libc/machine/powerpc/Makefile.in | 1 - newlib/libc/machine/pru/Makefile.in | 1 - newlib/libc/machine/riscv/Makefile.in | 1 - newlib/libc/machine/rl78/Makefile.in | 1 - newlib/libc/machine/rx/Makefile.in | 1 - newlib/libc/machine/sh/Makefile.in | 1 - newlib/libc/machine/sparc/Makefile.in | 1 - newlib/libc/machine/spu/Makefile.in | 1 - newlib/libc/machine/tic4x/Makefile.in | 1 - newlib/libc/machine/tic6x/Makefile.in | 1 - newlib/libc/machine/tic80/Makefile.in | 1 - newlib/libc/machine/v850/Makefile.in | 1 - newlib/libc/machine/visium/Makefile.in | 1 - newlib/libc/machine/w65/Makefile.in | 1 - newlib/libc/machine/x86_64/Makefile.in | 1 - newlib/libc/machine/xc16x/Makefile.in | 1 - newlib/libc/machine/xstormy16/Makefile.in | 1 - newlib/libc/machine/z8k/Makefile.in | 1 - newlib/libc/misc/Makefile.in | 1 - newlib/libc/posix/Makefile.in | 1 - newlib/libc/reent/Makefile.in | 1 - newlib/libc/search/Makefile.in | 1 - newlib/libc/signal/Makefile.in | 1 - newlib/libc/ssp/Makefile.in | 1 - newlib/libc/stdio/Makefile.in | 1 - newlib/libc/stdio64/Makefile.in | 1 - newlib/libc/stdlib/Makefile.in | 1 - newlib/libc/string/Makefile.in | 1 - newlib/libc/sys/a29khif/Makefile.in | 1 - newlib/libc/sys/amdgcn/Makefile.in | 1 - newlib/libc/sys/arm/Makefile.in | 1 - newlib/libc/sys/d10v/Makefile.in | 1 - newlib/libc/sys/epiphany/Makefile.in | 1 - newlib/libc/sys/h8300hms/Makefile.in | 1 - newlib/libc/sys/h8500hms/Makefile.in | 1 - newlib/libc/sys/m88kbug/Makefile.in | 1 - newlib/libc/sys/mmixware/Makefile.in | 1 - newlib/libc/sys/netware/Makefile.in | 1 - newlib/libc/sys/or1k/Makefile.in | 1 - newlib/libc/sys/phoenix/Makefile.in | 1 - newlib/libc/sys/phoenix/machine/arm/Makefile.in | 1 - newlib/libc/sys/rdos/Makefile.in | 1 - newlib/libc/sys/rtems/Makefile.in | 1 - newlib/libc/sys/sh/Makefile.in | 1 - newlib/libc/sys/sysmec/Makefile.in | 1 - newlib/libc/sys/sysnec810/Makefile.in | 1 - newlib/libc/sys/sysnecv850/Makefile.in | 1 - newlib/libc/sys/sysvi386/Makefile.in | 1 - newlib/libc/sys/sysvnecv70/Makefile.in | 1 - newlib/libc/sys/tic80/Makefile.in | 1 - newlib/libc/sys/tirtos/Makefile.in | 1 - newlib/libc/sys/w65/Makefile.in | 1 - newlib/libc/sys/z8ksim/Makefile.in | 1 - newlib/libc/syscalls/Makefile.in | 1 - newlib/libc/time/Makefile.in | 1 - newlib/libc/unix/Makefile.in | 1 - newlib/libc/xdr/Makefile.in | 1 - 111 files changed, 1 insertion(+), 143 deletions(-) diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index 4534ea4ee0d0..658bf0ec494e 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -51,8 +51,6 @@ endif # accumulation logic. SUBDIRS += . -noinst_DATA = $(CRT0) - noinst_LIBRARIES = libc.a SUBLIBS = \ argz/lib.a \ @@ -91,13 +89,5 @@ libc.a: $(SUBLIBS) $(SUBLIBS): ; @true -crt0.o: sys/crt0.o - rm -f $@ - ln sys/crt0.o $@ >/dev/null 2>/dev/null || cp sys/crt0.o $@ - -sys/crt0.o: ; @true - -CLEANFILES = $(CRT0) - ACLOCAL_AMFLAGS = -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac index 96187da99361..3a70e2986d2c 100644 --- a/newlib/libc/configure.ac +++ b/newlib/libc/configure.ac @@ -49,12 +49,6 @@ NEWLIB_CONFIGURE(..) AM_CONDITIONAL(NEWLIB_NANO_MALLOC, test x$newlib_nano_malloc = xyes) -CRT0= -if test "x${have_crt0}" = "xyes"; then - CRT0=sys/${sys_dir}/crt0.o -fi -AC_SUBST(CRT0) - dnl For each directory which we may or may not want, we define a name dnl for the library and an automake conditional for whether we should dnl build the library. -- 2.34.1