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 72CAA3858C27 for ; Tue, 15 Feb 2022 03:02:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 72CAA3858C27 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 BA2D2342F59; Tue, 15 Feb 2022 03:02:50 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] newlib: powerpc: simplify reallocr & callocr build logic Date: Mon, 14 Feb 2022 22:02:52 -0500 Message-Id: <20220215030252.18371-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.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, 15 Feb 2022 03:02:57 -0000 Replace the custom build rules (which require copying & pasting from the current Makefile) with small stub files. This allows us to drop the rules entirely and let Automake provide everything. --- newlib/libc/machine/powerpc/Makefile.am | 8 +------- newlib/libc/machine/powerpc/Makefile.in | 20 +++++++++++++------- newlib/libc/machine/powerpc/vec_callocr.c | 2 ++ newlib/libc/machine/powerpc/vec_reallocr.c | 2 ++ 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 newlib/libc/machine/powerpc/vec_callocr.c create mode 100644 newlib/libc/machine/powerpc/vec_reallocr.c diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am index 54d9c58c59dd..eebe640dee84 100644 --- a/newlib/libc/machine/powerpc/Makefile.am +++ b/newlib/libc/machine/powerpc/Makefile.am @@ -45,13 +45,7 @@ endif lib_a_DEPENDENCIES = $(lib_a_LIBADD) EXTRA_lib_a_SOURCES = \ vfprintf.c vfscanf.c \ - vec_malloc.c vec_calloc.c vec_free.c vec_realloc.c vec_mallocr.c \ + vec_malloc.c vec_calloc.c vec_free.c vec_realloc.c vec_mallocr.c vec_callocr.c vec_reallocr.c \ atosfix16.c atosfix32.c atosfix64.c atoufix16.c atoufix32.c atoufix64.c \ simdldtoa.c strtosfix16.c strtosfix32.c strtosfix64.c strtoufix16.c \ strtoufix32.c strtoufix64.c ufix64toa.c - -lib_a-vec_reallocr.o: vec_mallocr.c - $(CC) $(DEFS) -DINTERNAL_NEWLIB -DDEFINE_VECREALLOC $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_reallocr.o `test -f 'vec_mallocr.c' || echo '$(srcdir)/'`vec_mallocr.c - -lib_a-vec_callocr.o: vec_mallocr.c - $(CC) $(DEFS) -DINTERNAL_NEWLIB -DDEFINE_VECCALLOC $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_callocr.o `test -f 'vec_mallocr.c' || echo '$(srcdir)/'`vec_mallocr.c diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in index bd3eed7246db..dfacb6faaf54 100644 --- a/newlib/libc/machine/powerpc/Makefile.in +++ b/newlib/libc/machine/powerpc/Makefile.in @@ -332,7 +332,7 @@ lib_a_LIBADD = $(am__append_1) $(am__append_2) lib_a_DEPENDENCIES = $(lib_a_LIBADD) EXTRA_lib_a_SOURCES = \ vfprintf.c vfscanf.c \ - vec_malloc.c vec_calloc.c vec_free.c vec_realloc.c vec_mallocr.c \ + vec_malloc.c vec_calloc.c vec_free.c vec_realloc.c vec_mallocr.c vec_callocr.c vec_reallocr.c \ atosfix16.c atosfix32.c atosfix64.c atoufix16.c atoufix32.c atoufix64.c \ simdldtoa.c strtosfix16.c strtosfix32.c strtosfix64.c strtoufix16.c \ strtoufix32.c strtoufix64.c ufix64toa.c @@ -439,6 +439,18 @@ lib_a-vec_mallocr.o: vec_mallocr.c lib_a-vec_mallocr.obj: vec_mallocr.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_mallocr.obj `if test -f 'vec_mallocr.c'; then $(CYGPATH_W) 'vec_mallocr.c'; else $(CYGPATH_W) '$(srcdir)/vec_mallocr.c'; fi` +lib_a-vec_callocr.o: vec_callocr.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_callocr.o `test -f 'vec_callocr.c' || echo '$(srcdir)/'`vec_callocr.c + +lib_a-vec_callocr.obj: vec_callocr.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_callocr.obj `if test -f 'vec_callocr.c'; then $(CYGPATH_W) 'vec_callocr.c'; else $(CYGPATH_W) '$(srcdir)/vec_callocr.c'; fi` + +lib_a-vec_reallocr.o: vec_reallocr.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_reallocr.o `test -f 'vec_reallocr.c' || echo '$(srcdir)/'`vec_reallocr.c + +lib_a-vec_reallocr.obj: vec_reallocr.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_reallocr.obj `if test -f 'vec_reallocr.c'; then $(CYGPATH_W) 'vec_reallocr.c'; else $(CYGPATH_W) '$(srcdir)/vec_reallocr.c'; fi` + lib_a-atosfix16.o: atosfix16.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atosfix16.o `test -f 'atosfix16.c' || echo '$(srcdir)/'`atosfix16.c @@ -693,12 +705,6 @@ uninstall-am: .PRECIOUS: Makefile -lib_a-vec_reallocr.o: vec_mallocr.c - $(CC) $(DEFS) -DINTERNAL_NEWLIB -DDEFINE_VECREALLOC $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_reallocr.o `test -f 'vec_mallocr.c' || echo '$(srcdir)/'`vec_mallocr.c - -lib_a-vec_callocr.o: vec_mallocr.c - $(CC) $(DEFS) -DINTERNAL_NEWLIB -DDEFINE_VECCALLOC $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_callocr.o `test -f 'vec_mallocr.c' || echo '$(srcdir)/'`vec_mallocr.c - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libc/machine/powerpc/vec_callocr.c b/newlib/libc/machine/powerpc/vec_callocr.c new file mode 100644 index 000000000000..6ce00d0cd070 --- /dev/null +++ b/newlib/libc/machine/powerpc/vec_callocr.c @@ -0,0 +1,2 @@ +#define DEFINE_VECCALLOC +#include "vec_mallocr.c" diff --git a/newlib/libc/machine/powerpc/vec_reallocr.c b/newlib/libc/machine/powerpc/vec_reallocr.c new file mode 100644 index 000000000000..d1d99dec8414 --- /dev/null +++ b/newlib/libc/machine/powerpc/vec_reallocr.c @@ -0,0 +1,2 @@ +#define DEFINE_VECREALLOC +#include "vec_mallocr.c" -- 2.34.1