From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id B7E843858D28; Wed, 9 Mar 2022 09:44:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B7E843858D28 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: rename mallocr.c to _mallocr.c X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: d7b16b0576e0b1b9915d7b572c60e3e58d3614ea X-Git-Newrev: b1b44f777c740f8b4317c1a8e44286f228e21541 Message-Id: <20220309094440.B7E843858D28@sourceware.org> Date: Wed, 9 Mar 2022 09:44:40 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2022 09:44:40 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db1b44f777c7= 40f8b4317c1a8e44286f228e21541 commit b1b44f777c740f8b4317c1a8e44286f228e21541 Author: Mike Frysinger Date: Tue Mar 1 00:30:46 2022 -0500 newlib: rename mallocr.c to _mallocr.c =20 This file is a little confusing: it provides all of the mallocr logic, but is compiled multiple times to produce a unique symbol each time. For example, building mallocr.c with -DDEFINE_FREER produces freer.o that only defines _free_r(). This is fine for most symbols, but it's a little confusing when defining mallocr itself -- we produce a file with the same symbol name, but we still need -DDEFINE_MALLOCR. In order to move the logic from the build rules to source files, using mallocr.c both as a multiplexer and for defining a single symbol is a bit tricky. It's possible (if we add a lot of redundant preprocessor checks to mallocr.c, or we add complicated build flags just for this one files), but it's easier if we simply rename this to a dedicated file. So let's do that. =20 We do this as a dedicated commit because the next one will create a new mallocr.c file and git's automatic diff algorithms can handle trivial renames, but it can't handle renames+creates in the same commit. Diff: --- newlib/libc/stdlib/Makefile.am | 24 ++++++++++++------------ newlib/libc/stdlib/Makefile.in | 24 ++++++++++++------------ newlib/libc/stdlib/{mallocr.c =3D> _mallocr.c} | 0 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am index 950ad98ac..cb2fbe850 100644 --- a/newlib/libc/stdlib/Makefile.am +++ b/newlib/libc/stdlib/Makefile.am @@ -180,40 +180,40 @@ lib_a_CFLAGS =3D $(AM_CFLAGS) lib_a_DEPENDENCIES =3D $(LIBADD_OBJS) $(ELIX_OBJS) LIB_COMPILE =3D $(AM_V_CC)$(COMPILE) =20 -$(lpfx)mallocr.o: mallocr.c +$(lpfx)mallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC -c $< -o $@ =20 -$(lpfx)freer.o: mallocr.c +$(lpfx)freer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_FREE -c $< -o $@ =20 -$(lpfx)reallocr.o: mallocr.c +$(lpfx)reallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_REALLOC -c $< -o $@ =20 -$(lpfx)callocr.o: mallocr.c +$(lpfx)callocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CALLOC -c $< -o $@ =20 -$(lpfx)cfreer.o: mallocr.c +$(lpfx)cfreer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CFREE -c $< -o $@ =20 -$(lpfx)malignr.o: mallocr.c +$(lpfx)malignr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MEMALIGN -c $< -o $@ =20 -$(lpfx)vallocr.o: mallocr.c +$(lpfx)vallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_VALLOC -c $< -o $@ =20 -$(lpfx)pvallocr.o: mallocr.c +$(lpfx)pvallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_PVALLOC -c $< -o $@ =20 -$(lpfx)mallinfor.o: mallocr.c +$(lpfx)mallinfor.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLINFO -c $< -o $@ =20 -$(lpfx)mallstatsr.o: mallocr.c +$(lpfx)mallstatsr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_STATS -c $< -o $@ =20 -$(lpfx)msizer.o: mallocr.c +$(lpfx)msizer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $< -o $@ =20 -$(lpfx)malloptr.o: mallocr.c +$(lpfx)malloptr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOPT -c $< -o $@ =20 $(lpfx)dtoa.o: dtoa.c mprec.h diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in index b201e0555..10426ddab 100644 --- a/newlib/libc/stdlib/Makefile.in +++ b/newlib/libc/stdlib/Makefile.in @@ -1475,40 +1475,40 @@ uninstall-am: .PRECIOUS: Makefile =20 =20 -$(lpfx)mallocr.o: mallocr.c +$(lpfx)mallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC -c $< -o $@ =20 -$(lpfx)freer.o: mallocr.c +$(lpfx)freer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_FREE -c $< -o $@ =20 -$(lpfx)reallocr.o: mallocr.c +$(lpfx)reallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_REALLOC -c $< -o $@ =20 -$(lpfx)callocr.o: mallocr.c +$(lpfx)callocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CALLOC -c $< -o $@ =20 -$(lpfx)cfreer.o: mallocr.c +$(lpfx)cfreer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CFREE -c $< -o $@ =20 -$(lpfx)malignr.o: mallocr.c +$(lpfx)malignr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MEMALIGN -c $< -o $@ =20 -$(lpfx)vallocr.o: mallocr.c +$(lpfx)vallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_VALLOC -c $< -o $@ =20 -$(lpfx)pvallocr.o: mallocr.c +$(lpfx)pvallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_PVALLOC -c $< -o $@ =20 -$(lpfx)mallinfor.o: mallocr.c +$(lpfx)mallinfor.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLINFO -c $< -o $@ =20 -$(lpfx)mallstatsr.o: mallocr.c +$(lpfx)mallstatsr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_STATS -c $< -o $@ =20 -$(lpfx)msizer.o: mallocr.c +$(lpfx)msizer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $< -o $@ =20 -$(lpfx)malloptr.o: mallocr.c +$(lpfx)malloptr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOPT -c $< -o $@ =20 $(lpfx)dtoa.o: dtoa.c mprec.h diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/_mallocr.c similarity index 100% rename from newlib/libc/stdlib/mallocr.c rename to newlib/libc/stdlib/_mallocr.c