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 29EDE3858430 for ; Tue, 8 Feb 2022 01:57:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29EDE3858430 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 A0F1E342FC2; Tue, 8 Feb 2022 01:57:21 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 6/6] newlib: drop support for $oext Date: Mon, 7 Feb 2022 20:57:06 -0500 Message-Id: <20220208015706.6482-7-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220208015706.6482-1-vapier@gentoo.org> References: <20220208015706.6482-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: Tue, 08 Feb 2022 01:57:26 -0000 This was needed only to support libtool in case objects ended in .lo instead of .o, but we dropped libtool, so drop this too. --- newlib/Makefile.am | 26 +- newlib/Makefile.in | 27 +- newlib/acinclude.m4 | 3 +- newlib/configure | 4 +- newlib/configure.host | 2 - newlib/libc/Makefile.in | 1 - newlib/libc/argz/Makefile.in | 1 - newlib/libc/configure | 4 +- newlib/libc/ctype/Makefile.am | 2 +- newlib/libc/ctype/Makefile.in | 3 +- 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.am | 2 +- newlib/libc/reent/Makefile.in | 3 +- newlib/libc/search/Makefile.in | 1 - newlib/libc/signal/Makefile.in | 1 - newlib/libc/ssp/Makefile.in | 1 - newlib/libc/stdio/Makefile.am | 298 ++++++++--------- newlib/libc/stdio/Makefile.in | 299 +++++++++--------- newlib/libc/stdio64/Makefile.in | 1 - newlib/libc/stdlib/Makefile.am | 86 ++--- newlib/libc/stdlib/Makefile.in | 87 +++-- 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/decstation/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/configure | 4 +- newlib/libc/sys/phoenix/machine/Makefile.in | 1 - .../libc/sys/phoenix/machine/arm/Makefile.in | 1 - newlib/libc/sys/phoenix/machine/arm/configure | 4 +- newlib/libc/sys/phoenix/machine/configure | 4 +- newlib/libc/sys/rdos/Makefile.in | 1 - newlib/libc/sys/rtems/Makefile.in | 1 - newlib/libc/sys/sh/Makefile.in | 1 - newlib/libc/sys/sparc64/Makefile.in | 1 - newlib/libc/sys/sun4/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.am | 2 +- newlib/libc/time/Makefile.in | 3 +- newlib/libc/unix/Makefile.in | 1 - newlib/libc/xdr/Makefile.in | 1 - newlib/libm/Makefile.in | 1 - newlib/libm/common/Makefile.in | 1 - newlib/libm/complex/Makefile.in | 1 - newlib/libm/configure | 4 +- newlib/libm/fenv/Makefile.in | 1 - newlib/libm/machine/aarch64/Makefile.in | 1 - newlib/libm/machine/arm/Makefile.in | 1 - newlib/libm/machine/i386/Makefile.in | 1 - newlib/libm/machine/mips/Makefile.in | 1 - newlib/libm/machine/nds32/Makefile.in | 1 - newlib/libm/machine/powerpc/Makefile.in | 1 - newlib/libm/machine/pru/Makefile.in | 1 - newlib/libm/machine/riscv/Makefile.in | 1 - newlib/libm/machine/sparc/Makefile.in | 1 - newlib/libm/machine/spu/Makefile.in | 1 - newlib/libm/machine/x86_64/Makefile.in | 1 - newlib/libm/math/Makefile.in | 1 - newlib/libm/mathfp/Makefile.in | 1 - 144 files changed, 423 insertions(+), 568 deletions(-) diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 3befb2126116..5767f8524fd0 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -84,19 +84,19 @@ toollib_DATA = $(CRT0) $(CRT1) # both libc.a and libm.a. We build them in libm.a and copy them over, # along with some required supporting routines. MATHOBJS_IN_LIBC = \ - $(lpfx)s_fpclassify.$(oext) $(lpfx)sf_fpclassify.$(oext) \ - $(lpfx)s_isinf.$(oext) $(lpfx)sf_isinf.$(oext) \ - $(lpfx)s_isnan.$(oext) $(lpfx)sf_isnan.$(oext) \ - $(lpfx)s_isinfd.$(oext) $(lpfx)sf_isinff.$(oext) \ - $(lpfx)s_isnand.$(oext) $(lpfx)sf_isnanf.$(oext) \ - $(lpfx)s_nan.$(oext) $(lpfx)sf_nan.$(oext) \ - $(lpfx)s_ldexp.$(oext) $(lpfx)sf_ldexp.$(oext) \ - $(lpfx)s_frexp.$(oext) $(lpfx)sf_frexp.$(oext) $(lpfx)frexpl.$(oext) \ - $(lpfx)s_modf.$(oext) \ - $(lpfx)sf_modf.$(oext) $(lpfx)s_scalbn.$(oext) \ - $(lpfx)sf_scalbn.$(oext) \ - $(lpfx)s_finite.$(oext) $(lpfx)sf_finite.$(oext) \ - $(lpfx)s_copysign.$(oext) $(lpfx)sf_copysign.$(oext) + $(lpfx)s_fpclassify.o $(lpfx)sf_fpclassify.o \ + $(lpfx)s_isinf.o $(lpfx)sf_isinf.o \ + $(lpfx)s_isnan.o $(lpfx)sf_isnan.o \ + $(lpfx)s_isinfd.o $(lpfx)sf_isinff.o \ + $(lpfx)s_isnand.o $(lpfx)sf_isnanf.o \ + $(lpfx)s_nan.o $(lpfx)sf_nan.o \ + $(lpfx)s_ldexp.o $(lpfx)sf_ldexp.o \ + $(lpfx)s_frexp.o $(lpfx)sf_frexp.o $(lpfx)frexpl.o \ + $(lpfx)s_modf.o \ + $(lpfx)sf_modf.o $(lpfx)s_scalbn.o \ + $(lpfx)sf_scalbn.o \ + $(lpfx)s_finite.o $(lpfx)sf_finite.o \ + $(lpfx)s_copysign.o $(lpfx)sf_copysign.o libc.a: libc/libc.a libm.a rm -rf libc.a libg.a tmp diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4 index d484e447ac82..3de4b6e5dc73 100644 --- a/newlib/acinclude.m4 +++ b/newlib/acinclude.m4 @@ -230,10 +230,9 @@ fi # Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we # use oext, which is set in configure.host based on the target platform. -OBJEXT=${oext} +OBJEXT=o AC_SUBST(OBJEXT) -AC_SUBST(oext) AC_SUBST(lpfx) AC_SUBST(libm_machine_dir) diff --git a/newlib/configure.host b/newlib/configure.host index 22023f9aefd2..3c5df5a41b6a 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -43,7 +43,6 @@ # stdio64_dir "stdio64" to build libc/stdio64, "" otherwise # syscall_dir "syscalls" to build libc/syscalls, "" otherwise # unix_dir "unix" to build libc/unix, "" otherwise -# oext object file extension - needed for libtool support # lpfx library object prefix - generated when no libtool # crt1 name of crt1 object if one is provided # crt1_dir directory where crt1 object is found @@ -77,7 +76,6 @@ default_newlib_io_pos_args=no default_newlib_atexit_dynamic_alloc=yes default_newlib_nano_malloc=no default_newlib_reent_check_verify=yes -oext=o lpfx="lib_a-" newlib_msg_warn= diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am index c7bdf2d7446b..5c4269f7e847 100644 --- a/newlib/libc/ctype/Makefile.am +++ b/newlib/libc/ctype/Makefile.am @@ -84,4 +84,4 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -$(lpfx)ctype_.$(oext): ctype_.c ctype_iso.h ctype_cp.h +$(lpfx)ctype_.o: ctype_.c ctype_iso.h ctype_cp.h diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am index 10fc47393864..e645665ca1b7 100644 --- a/newlib/libc/reent/Makefile.am +++ b/newlib/libc/reent/Makefile.am @@ -50,4 +50,4 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -$(lpfx)impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h +$(lpfx)impure.o: $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am index 40c0d89e8a04..a2c688cbe72f 100644 --- a/newlib/libc/stdio/Makefile.am +++ b/newlib/libc/stdio/Makefile.am @@ -193,31 +193,31 @@ endif !ELIX_LEVEL_1 if NEWLIB_NANO_FORMATTED_IO LIBADD_OBJS = \ - %D%/$(lpfx)nano-vfprintf_float.$(oext) \ - %D%/$(lpfx)nano-svfprintf.$(oext) \ - %D%/$(lpfx)nano-svfscanf.$(oext) \ - %D%/$(lpfx)nano-vfprintf.$(oext) \ - %D%/$(lpfx)nano-vfprintf_i.$(oext) \ - %D%/$(lpfx)nano-vfscanf.$(oext) \ - %D%/$(lpfx)nano-vfscanf_i.$(oext) \ - %D%/$(lpfx)nano-vfscanf_float.$(oext) \ - %D%/$(lpfx)svfiwprintf.$(oext) \ - %D%/$(lpfx)svfwprintf.$(oext) \ - %D%/$(lpfx)vfiwprintf.$(oext) \ - %D%/$(lpfx)svfiwscanf.$(oext) \ - %D%/$(lpfx)svfwscanf.$(oext) \ - %D%/$(lpfx)vfiwscanf.$(oext) \ - %D%/$(lpfx)vfwscanf.$(oext) + %D%/$(lpfx)nano-vfprintf_float.o \ + %D%/$(lpfx)nano-svfprintf.o \ + %D%/$(lpfx)nano-svfscanf.o \ + %D%/$(lpfx)nano-vfprintf.o \ + %D%/$(lpfx)nano-vfprintf_i.o \ + %D%/$(lpfx)nano-vfscanf.o \ + %D%/$(lpfx)nano-vfscanf_i.o \ + %D%/$(lpfx)nano-vfscanf_float.o \ + %D%/$(lpfx)svfiwprintf.o \ + %D%/$(lpfx)svfwprintf.o \ + %D%/$(lpfx)vfiwprintf.o \ + %D%/$(lpfx)svfiwscanf.o \ + %D%/$(lpfx)svfwscanf.o \ + %D%/$(lpfx)vfiwscanf.o \ + %D%/$(lpfx)vfwscanf.o else LIBADD_OBJS = \ - %D%/$(lpfx)svfiprintf.$(oext) $(lpfx)svfprintf.$(oext) \ - %D%/$(lpfx)svfiscanf.$(oext) $(lpfx)svfscanf.$(oext) \ - %D%/$(lpfx)vfiprintf.$(oext) \ - %D%/$(lpfx)vfscanf.$(oext) $(lpfx)vfiscanf.$(oext) \ - %D%/$(lpfx)svfiwprintf.$(oext) $(lpfx)svfwprintf.$(oext) \ - %D%/$(lpfx)vfiwprintf.$(oext) \ - %D%/$(lpfx)svfiwscanf.$(oext) $(lpfx)svfwscanf.$(oext) \ - %D%/$(lpfx)vfiwscanf.$(oext) $(lpfx)vfwscanf.$(oext) + %D%/$(lpfx)svfiprintf.o $(lpfx)svfprintf.o \ + %D%/$(lpfx)svfiscanf.o $(lpfx)svfscanf.o \ + %D%/$(lpfx)vfiprintf.o \ + %D%/$(lpfx)vfscanf.o $(lpfx)vfiscanf.o \ + %D%/$(lpfx)svfiwprintf.o $(lpfx)svfwprintf.o \ + %D%/$(lpfx)vfiwprintf.o \ + %D%/$(lpfx)svfiwscanf.o $(lpfx)svfwscanf.o \ + %D%/$(lpfx)vfiwscanf.o $(lpfx)vfwscanf.o endif noinst_LIBRARIES = lib.a @@ -236,184 +236,184 @@ LIB_COMPILE = $(AM_V_CC)$(COMPILE) if NEWLIB_NANO_FORMATTED_IO # Rules compiling small-footprint nano-formatted-io implementation. -$(lpfx)nano-vfprintf.$(oext): nano-vfprintf.c +$(lpfx)nano-vfprintf.o: nano-vfprintf.c %D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf.c -o $@ -$(lpfx)nano-vfprintf_i.$(oext): nano-vfprintf_i.c +$(lpfx)nano-vfprintf_i.o: nano-vfprintf_i.c %D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf_i.c -o $@ -$(lpfx)nano-vfprintf_float.$(oext): nano-vfprintf_float.c +$(lpfx)nano-vfprintf_float.o: nano-vfprintf_float.c %D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf_float.c -o $@ -$(lpfx)nano-svfprintf.$(oext): nano-vfprintf.c +$(lpfx)nano-svfprintf.o: nano-vfprintf.c %D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/nano-vfprintf.c -o $@ endif # This rule is needed so that libtool compiles vfiprintf before vfprintf. # Otherwise libtool moves vfprintf.o and subsequently can't find it. -$(lpfx)vfiprintf.$(oext): vfprintf.c +$(lpfx)vfiprintf.o: vfprintf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@ -$(lpfx)svfprintf.$(oext): vfprintf.c +$(lpfx)svfprintf.o: vfprintf.c %D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfprintf.c -o $@ -$(lpfx)svfiprintf.$(oext): vfprintf.c +$(lpfx)svfiprintf.o: vfprintf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfprintf.c -o $@ -$(lpfx)vfiwprintf.$(oext): vfwprintf.c +$(lpfx)vfiwprintf.o: vfwprintf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfwprintf.c -o $@ -$(lpfx)svfwprintf.$(oext): vfwprintf.c +$(lpfx)svfwprintf.o: vfwprintf.c %D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfwprintf.c -o $@ -$(lpfx)svfiwprintf.$(oext): vfwprintf.c +$(lpfx)svfiwprintf.o: vfwprintf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfwprintf.c -o $@ if NEWLIB_NANO_FORMATTED_IO # Rules compiling small-footprint nano-formatted-io implementation. -$(lpfx)nano-vfscanf.$(oext): nano-vfscanf.c +$(lpfx)nano-vfscanf.o: nano-vfscanf.c %D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf.c -o $@ -$(lpfx)nano-vfscanf_i.$(oext): nano-vfscanf_i.c +$(lpfx)nano-vfscanf_i.o: nano-vfscanf_i.c %D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf_i.c -o $@ -$(lpfx)nano-vfscanf_float.$(oext): nano-vfscanf_float.c +$(lpfx)nano-vfscanf_float.o: nano-vfscanf_float.c %D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf_float.c -o $@ -$(lpfx)nano-svfscanf.$(oext): nano-vfscanf.c +$(lpfx)nano-svfscanf.o: nano-vfscanf.c %D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/nano-vfscanf.c -o $@ endif -$(lpfx)vfscanf.$(oext): vfscanf.c +$(lpfx)vfscanf.o: vfscanf.c %D%/$(LIB_COMPILE) -c $(srcdir)/vfscanf.c -o $@ -$(lpfx)vfiscanf.$(oext): vfscanf.c +$(lpfx)vfiscanf.o: vfscanf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfscanf.c -o $@ -$(lpfx)svfscanf.$(oext): vfscanf.c +$(lpfx)svfscanf.o: vfscanf.c %D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfscanf.c -o $@ -$(lpfx)svfiscanf.$(oext): vfscanf.c +$(lpfx)svfiscanf.o: vfscanf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfscanf.c -o $@ -$(lpfx)vfwscanf.$(oext): vfwscanf.c +$(lpfx)vfwscanf.o: vfwscanf.c %D%/$(LIB_COMPILE) -c $(srcdir)/vfwscanf.c -o $@ -$(lpfx)vfiwscanf.$(oext): vfwscanf.c +$(lpfx)vfiwscanf.o: vfwscanf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfwscanf.c -o $@ -$(lpfx)svfwscanf.$(oext): vfwscanf.c +$(lpfx)svfwscanf.o: vfwscanf.c %D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfwscanf.c -o $@ -$(lpfx)svfiwscanf.$(oext): vfwscanf.c +$(lpfx)svfiwscanf.o: vfwscanf.c %D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfwscanf.c -o $@ -$(lpfx)clearerr.$(oext): local.h -$(lpfx)clearerr_u.$(oext): local.h -$(lpfx)fclose.$(oext): local.h -$(lpfx)fdopen.$(oext): local.h -$(lpfx)feof.$(oext): local.h -$(lpfx)feof_u.$(oext): local.h -$(lpfx)ferror.$(oext): local.h -$(lpfx)ferror_u.$(oext): local.h -$(lpfx)fflush.$(oext): local.h -$(lpfx)fflush_u.$(oext): fflush.c -$(lpfx)fgetc.$(oext): local.h -$(lpfx)fgetc_u.$(oext): local.h -$(lpfx)fgets.$(oext): local.h -$(lpfx)fgets_u.$(oext): fgets.c -$(lpfx)fgetwc.$(oext): local.h -$(lpfx)fgetwc_u.$(oext): local.h -$(lpfx)fgetws.$(oext): local.h -$(lpfx)fgetws_u.$(oext): fgetws.c -$(lpfx)fileno.$(oext): local.h -$(lpfx)fileno_u.$(oext): local.h -$(lpfx)findfp.$(oext): local.h -$(lpfx)fmemopen.$(oext): local.h -$(lpfx)fopen.$(oext): local.h -$(lpfx)fopencookie.$(oext): local.h -$(lpfx)fpurge.$(oext): local.h -$(lpfx)fputc.$(oext): local.h -$(lpfx)fputc_u.$(oext): local.h -$(lpfx)fputs.$(oext): fvwrite.h -$(lpfx)fputs_u.$(oext): fputs.c -$(lpfx)fputwc.$(oext): local.h -$(lpfx)fputwc_u.$(oext): local.h -$(lpfx)fputws.$(oext): local.h fvwrite.h -$(lpfx)fputws_u.$(oext): fputws.c -$(lpfx)fread.$(oext): local.h -$(lpfx)fread_u.$(oext): fread.c -$(lpfx)freopen.$(oext): local.h -$(lpfx)fseek.$(oext): local.h -$(lpfx)fsetlocking.$(oext): local.h -$(lpfx)ftell.$(oext): local.h -$(lpfx)funopen.$(oext): local.h -$(lpfx)fvwrite.$(oext): local.h fvwrite.h -$(lpfx)fwalk.$(oext): local.h -$(lpfx)fwide.$(oext): local.h -$(lpfx)fwprintf.$(oext): local.h -$(lpfx)fwrite.$(oext): local.h fvwrite.h -$(lpfx)fwrite_u.$(oext): fwrite.c -$(lpfx)fwscanf.$(oext): local.h -$(lpfx)getwc.$(oext): local.h -$(lpfx)getwc_u.$(oext): local.h -$(lpfx)getwchar.$(oext): local.h -$(lpfx)getwchar_u.$(oext): local.h -$(lpfx)iscanf.$(oext): local.h -$(lpfx)makebuf.$(oext): local.h -$(lpfx)open_memstream.$(oext): local.h -$(lpfx)puts.$(oext): fvwrite.h -$(lpfx)putwc.$(oext): local.h -$(lpfx)putwc_u.$(oext): local.h -$(lpfx)putwchar.$(oext): local.h -$(lpfx)putwchar_u.$(oext): local.h -$(lpfx)refill.$(oext): local.h -$(lpfx)scanf.$(oext): local.h -$(lpfx)setbuf.$(oext): local.h -$(lpfx)setvbuf.$(oext): local.h -$(lpfx)siprintf.$(oext): local.h -$(lpfx)siscanf.$(oext): local.h -$(lpfx)sniprintf.$(oext): local.h -$(lpfx)sprintf.$(oext): local.h -$(lpfx)sscanf.$(oext): local.h -$(lpfx)stdio.$(oext): local.h +$(lpfx)clearerr.o: local.h +$(lpfx)clearerr_u.o: local.h +$(lpfx)fclose.o: local.h +$(lpfx)fdopen.o: local.h +$(lpfx)feof.o: local.h +$(lpfx)feof_u.o: local.h +$(lpfx)ferror.o: local.h +$(lpfx)ferror_u.o: local.h +$(lpfx)fflush.o: local.h +$(lpfx)fflush_u.o: fflush.c +$(lpfx)fgetc.o: local.h +$(lpfx)fgetc_u.o: local.h +$(lpfx)fgets.o: local.h +$(lpfx)fgets_u.o: fgets.c +$(lpfx)fgetwc.o: local.h +$(lpfx)fgetwc_u.o: local.h +$(lpfx)fgetws.o: local.h +$(lpfx)fgetws_u.o: fgetws.c +$(lpfx)fileno.o: local.h +$(lpfx)fileno_u.o: local.h +$(lpfx)findfp.o: local.h +$(lpfx)fmemopen.o: local.h +$(lpfx)fopen.o: local.h +$(lpfx)fopencookie.o: local.h +$(lpfx)fpurge.o: local.h +$(lpfx)fputc.o: local.h +$(lpfx)fputc_u.o: local.h +$(lpfx)fputs.o: fvwrite.h +$(lpfx)fputs_u.o: fputs.c +$(lpfx)fputwc.o: local.h +$(lpfx)fputwc_u.o: local.h +$(lpfx)fputws.o: local.h fvwrite.h +$(lpfx)fputws_u.o: fputws.c +$(lpfx)fread.o: local.h +$(lpfx)fread_u.o: fread.c +$(lpfx)freopen.o: local.h +$(lpfx)fseek.o: local.h +$(lpfx)fsetlocking.o: local.h +$(lpfx)ftell.o: local.h +$(lpfx)funopen.o: local.h +$(lpfx)fvwrite.o: local.h fvwrite.h +$(lpfx)fwalk.o: local.h +$(lpfx)fwide.o: local.h +$(lpfx)fwprintf.o: local.h +$(lpfx)fwrite.o: local.h fvwrite.h +$(lpfx)fwrite_u.o: fwrite.c +$(lpfx)fwscanf.o: local.h +$(lpfx)getwc.o: local.h +$(lpfx)getwc_u.o: local.h +$(lpfx)getwchar.o: local.h +$(lpfx)getwchar_u.o: local.h +$(lpfx)iscanf.o: local.h +$(lpfx)makebuf.o: local.h +$(lpfx)open_memstream.o: local.h +$(lpfx)puts.o: fvwrite.h +$(lpfx)putwc.o: local.h +$(lpfx)putwc_u.o: local.h +$(lpfx)putwchar.o: local.h +$(lpfx)putwchar_u.o: local.h +$(lpfx)refill.o: local.h +$(lpfx)scanf.o: local.h +$(lpfx)setbuf.o: local.h +$(lpfx)setvbuf.o: local.h +$(lpfx)siprintf.o: local.h +$(lpfx)siscanf.o: local.h +$(lpfx)sniprintf.o: local.h +$(lpfx)sprintf.o: local.h +$(lpfx)sscanf.o: local.h +$(lpfx)stdio.o: local.h if NEWLIB_NANO_FORMATTED_IO -$(lpfx)nano-svfprintf.$(oext): local.h nano-vfprintf_local.h -$(lpfx)nano-svfscanf.$(oext): local.h nano-vfscanf_local.h +$(lpfx)nano-svfprintf.o: local.h nano-vfprintf_local.h +$(lpfx)nano-svfscanf.o: local.h nano-vfscanf_local.h endif -$(lpfx)svfiprintf.$(oext): local.h -$(lpfx)svfiscanf.$(oext): local.h floatio.h -$(lpfx)svfprintf.$(oext): local.h -$(lpfx)svfscanf.$(oext): local.h floatio.h -$(lpfx)swprintf.$(oext): local.h -$(lpfx)swscanf.$(oext): local.h -$(lpfx)ungetc.$(oext): local.h -$(lpfx)ungetwc.$(oext): local.h +$(lpfx)svfiprintf.o: local.h +$(lpfx)svfiscanf.o: local.h floatio.h +$(lpfx)svfprintf.o: local.h +$(lpfx)svfscanf.o: local.h floatio.h +$(lpfx)swprintf.o: local.h +$(lpfx)swscanf.o: local.h +$(lpfx)ungetc.o: local.h +$(lpfx)ungetwc.o: local.h if NEWLIB_NANO_FORMATTED_IO -$(lpfx)nano-vfprintf.$(oext): local.h nano-vfprintf_local.h -$(lpfx)nano-vfprintf_i.$(oext): local.h nano-vfprintf_local.h -$(lpfx)nano-vfprintf_float.$(oext): local.h floatio.h nano-vfprintf_local.h -$(lpfx)nano-vfscanf.$(oext): local.h nano-vfscanf_local.h -$(lpfx)nano-vfscanf_i.$(oext): local.h nano-vfscanf_local.h -$(lpfx)nano-vfscanf_float.$(oext): local.h floatio.h nano-vfscanf_local.h +$(lpfx)nano-vfprintf.o: local.h nano-vfprintf_local.h +$(lpfx)nano-vfprintf_i.o: local.h nano-vfprintf_local.h +$(lpfx)nano-vfprintf_float.o: local.h floatio.h nano-vfprintf_local.h +$(lpfx)nano-vfscanf.o: local.h nano-vfscanf_local.h +$(lpfx)nano-vfscanf_i.o: local.h nano-vfscanf_local.h +$(lpfx)nano-vfscanf_float.o: local.h floatio.h nano-vfscanf_local.h endif -$(lpfx)vfiprintf.$(oext): local.h -$(lpfx)vfiscanf.$(oext): local.h floatio.h -$(lpfx)vfprintf.$(oext): local.h -$(lpfx)vfscanf.$(oext): local.h floatio.h -$(lpfx)vfwprintf.$(oext): local.h -$(lpfx)vfwscanf.$(oext): local.h -$(lpfx)viscanf.$(oext): local.h -$(lpfx)vscanf.$(oext): local.h -$(lpfx)vsiscanf.$(oext): local.h -$(lpfx)vsniprintf.$(oext): local.h -$(lpfx)vsscanf.$(oext): local.h -$(lpfx)vswprintf.$(oext): local.h -$(lpfx)vswscanf.$(oext): local.h -$(lpfx)vwprintf.$(oext): local.h -$(lpfx)vwscanf.$(oext): local.h -$(lpfx)wbuf.$(oext): local.h fvwrite.h -$(lpfx)wprintf.$(oext): local.h -$(lpfx)wscanf.$(oext): local.h -$(lpfx)wsetup.$(oext): local.h +$(lpfx)vfiprintf.o: local.h +$(lpfx)vfiscanf.o: local.h floatio.h +$(lpfx)vfprintf.o: local.h +$(lpfx)vfscanf.o: local.h floatio.h +$(lpfx)vfwprintf.o: local.h +$(lpfx)vfwscanf.o: local.h +$(lpfx)viscanf.o: local.h +$(lpfx)vscanf.o: local.h +$(lpfx)vsiscanf.o: local.h +$(lpfx)vsniprintf.o: local.h +$(lpfx)vsscanf.o: local.h +$(lpfx)vswprintf.o: local.h +$(lpfx)vswscanf.o: local.h +$(lpfx)vwprintf.o: local.h +$(lpfx)vwscanf.o: local.h +$(lpfx)wbuf.o: local.h fvwrite.h +$(lpfx)wprintf.o: local.h +$(lpfx)wscanf.o: local.h +$(lpfx)wsetup.o: local.h diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am index 9e2e42e65e25..2d089308932b 100644 --- a/newlib/libc/stdlib/Makefile.am +++ b/newlib/libc/stdlib/Makefile.am @@ -162,10 +162,10 @@ ELIX_2_SOURCES = \ wctob.c ELIX_2_OBJS = \ - $(lpfx)$(MALIGNR).$(oext) \ - $(lpfx)$(MALLOPTR).$(oext) \ - $(lpfx)$(PVALLOCR).$(oext) \ - $(lpfx)$(VALLOCR).$(oext) + $(lpfx)$(MALIGNR).o \ + $(lpfx)$(MALLOPTR).o \ + $(lpfx)$(PVALLOCR).o \ + $(lpfx)$(VALLOCR).o ELIX_3_SOURCES = \ putenv.c \ @@ -196,10 +196,10 @@ endif endif # Because of how libtool moves objects around, mallocr must be built last. -LIBADD_OBJS = $(lpfx)$(FREER).$(oext) $(lpfx)$(REALLOCR).$(oext) \ - $(lpfx)$(CALLOCR).$(oext) $(lpfx)$(CFREER).$(oext) \ - $(lpfx)$(MALLINFOR).$(oext) $(lpfx)$(MALLSTATSR).$(oext) \ - $(lpfx)$(MSIZER).$(oext) $(lpfx)$(MALLOCR).$(oext) +LIBADD_OBJS = $(lpfx)$(FREER).o $(lpfx)$(REALLOCR).o \ + $(lpfx)$(CALLOCR).o $(lpfx)$(CFREER).o \ + $(lpfx)$(MALLINFOR).o $(lpfx)$(MALLSTATSR).o \ + $(lpfx)$(MSIZER).o $(lpfx)$(MALLOCR).o noinst_LIBRARIES = lib.a lib_a_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES) $(ELIX_SOURCES) @@ -210,62 +210,62 @@ LIB_COMPILE = $(AM_V_CC)$(COMPILE) MALLOC_COMPILE = $(LIB_COMPILE) -DINTERNAL_NEWLIB -$(lpfx)$(MALLOCR).$(oext): $(MALLOCR).c +$(lpfx)$(MALLOCR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_MALLOC -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(FREER).$(oext): $(MALLOCR).c +$(lpfx)$(FREER).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_FREE -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(REALLOCR).$(oext): $(MALLOCR).c +$(lpfx)$(REALLOCR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_REALLOC -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(CALLOCR).$(oext): $(MALLOCR).c +$(lpfx)$(CALLOCR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_CALLOC -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(CFREER).$(oext): $(MALLOCR).c +$(lpfx)$(CFREER).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_CFREE -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(MALIGNR).$(oext): $(MALLOCR).c +$(lpfx)$(MALIGNR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_MEMALIGN -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(VALLOCR).$(oext): $(MALLOCR).c +$(lpfx)$(VALLOCR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_VALLOC -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(PVALLOCR).$(oext): $(MALLOCR).c +$(lpfx)$(PVALLOCR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_PVALLOC -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(MALLINFOR).$(oext): $(MALLOCR).c +$(lpfx)$(MALLINFOR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_MALLINFO -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(MALLSTATSR).$(oext): $(MALLOCR).c +$(lpfx)$(MALLSTATSR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_MALLOC_STATS -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(MSIZER).$(oext): $(MALLOCR).c +$(lpfx)$(MSIZER).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)$(MALLOPTR).$(oext): $(MALLOCR).c +$(lpfx)$(MALLOPTR).o: $(MALLOCR).c $(MALLOC_COMPILE) -DDEFINE_MALLOPT -c $(srcdir)/$(MALLOCR).c -o $@ -$(lpfx)dtoa.$(oext): dtoa.c mprec.h -$(lpfx)ldtoa.$(oext): ldtoa.c mprec.h gdtoa.h -$(lpfx)gdtoa-ldtoa.$(oext): gdtoa-ldtoa.c mprec.h gdtoaimp.h gdtoa.h -$(lpfx)gdtoa-gdtoa.$(oext): gdtoa-gdtoa.c mprec.h gdtoaimp.h gdtoa.h -$(lpfx)gdtoa-dmisc.$(oext): gdtoa-dmisc.c mprec.h gdtoaimp.h gdtoa.h -$(lpfx)gdtoa-gmisc.$(oext): gdtoa-gmisc.c mprec.h gdtoaimp.h gdtoa.h -$(lpfx)ecvtbuf.$(oext): ecvtbuf.c mprec.h -$(lpfx)mbtowc_r.$(oext): mbtowc_r.c mbctype.h -$(lpfx)mprec.$(oext): mprec.c mprec.h -$(lpfx)strtod.$(oext): strtod.c mprec.h -$(lpfx)gdtoa-gethex.$(oext): gdtoa-gethex.c mprec.h -$(lpfx)gdtoa-hexnan.$(oext): gdtoa-hexnan.c mprec.h -$(lpfx)wctomb_r.$(oext): wctomb_r.c mbctype.h -$(lpfx)drand48.$(oext): drand48.c rand48.h -$(lpfx)erand48.$(oext): erand48.c rand48.h -$(lpfx)jrand48.$(oext): jrand48.c rand48.h -$(lpfx)lcong48.$(oext): lcong48.c rand48.h -$(lpfx)lrand48.$(oext): lrand48.c rand48.h -$(lpfx)mrand48.$(oext): mrand48.c rand48.h -$(lpfx)nrand48.$(oext): nrand48.c rand48.h -$(lpfx)rand48.$(oext): rand48.c rand48.h -$(lpfx)seed48.$(oext): seed48.c rand48.h -$(lpfx)srand48.$(oext): srand48.c rand48.h +$(lpfx)dtoa.o: dtoa.c mprec.h +$(lpfx)ldtoa.o: ldtoa.c mprec.h gdtoa.h +$(lpfx)gdtoa-ldtoa.o: gdtoa-ldtoa.c mprec.h gdtoaimp.h gdtoa.h +$(lpfx)gdtoa-gdtoa.o: gdtoa-gdtoa.c mprec.h gdtoaimp.h gdtoa.h +$(lpfx)gdtoa-dmisc.o: gdtoa-dmisc.c mprec.h gdtoaimp.h gdtoa.h +$(lpfx)gdtoa-gmisc.o: gdtoa-gmisc.c mprec.h gdtoaimp.h gdtoa.h +$(lpfx)ecvtbuf.o: ecvtbuf.c mprec.h +$(lpfx)mbtowc_r.o: mbtowc_r.c mbctype.h +$(lpfx)mprec.o: mprec.c mprec.h +$(lpfx)strtod.o: strtod.c mprec.h +$(lpfx)gdtoa-gethex.o: gdtoa-gethex.c mprec.h +$(lpfx)gdtoa-hexnan.o: gdtoa-hexnan.c mprec.h +$(lpfx)wctomb_r.o: wctomb_r.c mbctype.h +$(lpfx)drand48.o: drand48.c rand48.h +$(lpfx)erand48.o: erand48.c rand48.h +$(lpfx)jrand48.o: jrand48.c rand48.h +$(lpfx)lcong48.o: lcong48.c rand48.h +$(lpfx)lrand48.o: lrand48.c rand48.h +$(lpfx)mrand48.o: mrand48.c rand48.h +$(lpfx)nrand48.o: nrand48.c rand48.h +$(lpfx)rand48.o: rand48.c rand48.h +$(lpfx)seed48.o: seed48.c rand48.h +$(lpfx)srand48.o: srand48.c rand48.h diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am index 2f3fd49eec9e..39d6b9bf085d 100644 --- a/newlib/libc/time/Makefile.am +++ b/newlib/libc/time/Makefile.am @@ -30,4 +30,4 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -$(lpfx)wcsftime.$(oext): strftime.c +$(lpfx)wcsftime.o: strftime.c -- 2.34.1