From b1b44f777c740f8b4317c1a8e44286f228e21541 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 1 Mar 2022 00:30:46 -0500 Subject: [PATCH] newlib: rename mallocr.c to _mallocr.c 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. 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. --- newlib/libc/stdlib/Makefile.am | 24 ++++++++++---------- newlib/libc/stdlib/Makefile.in | 24 ++++++++++---------- newlib/libc/stdlib/{mallocr.c => _mallocr.c} | 0 3 files changed, 24 insertions(+), 24 deletions(-) rename newlib/libc/stdlib/{mallocr.c => _mallocr.c} (100%) 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 = $(AM_CFLAGS) lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(ELIX_OBJS) LIB_COMPILE = $(AM_V_CC)$(COMPILE) -$(lpfx)mallocr.o: mallocr.c +$(lpfx)mallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC -c $< -o $@ -$(lpfx)freer.o: mallocr.c +$(lpfx)freer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_FREE -c $< -o $@ -$(lpfx)reallocr.o: mallocr.c +$(lpfx)reallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_REALLOC -c $< -o $@ -$(lpfx)callocr.o: mallocr.c +$(lpfx)callocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CALLOC -c $< -o $@ -$(lpfx)cfreer.o: mallocr.c +$(lpfx)cfreer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CFREE -c $< -o $@ -$(lpfx)malignr.o: mallocr.c +$(lpfx)malignr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MEMALIGN -c $< -o $@ -$(lpfx)vallocr.o: mallocr.c +$(lpfx)vallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_VALLOC -c $< -o $@ -$(lpfx)pvallocr.o: mallocr.c +$(lpfx)pvallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_PVALLOC -c $< -o $@ -$(lpfx)mallinfor.o: mallocr.c +$(lpfx)mallinfor.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLINFO -c $< -o $@ -$(lpfx)mallstatsr.o: mallocr.c +$(lpfx)mallstatsr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_STATS -c $< -o $@ -$(lpfx)msizer.o: mallocr.c +$(lpfx)msizer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $< -o $@ -$(lpfx)malloptr.o: mallocr.c +$(lpfx)malloptr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOPT -c $< -o $@ $(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 -$(lpfx)mallocr.o: mallocr.c +$(lpfx)mallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC -c $< -o $@ -$(lpfx)freer.o: mallocr.c +$(lpfx)freer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_FREE -c $< -o $@ -$(lpfx)reallocr.o: mallocr.c +$(lpfx)reallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_REALLOC -c $< -o $@ -$(lpfx)callocr.o: mallocr.c +$(lpfx)callocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CALLOC -c $< -o $@ -$(lpfx)cfreer.o: mallocr.c +$(lpfx)cfreer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_CFREE -c $< -o $@ -$(lpfx)malignr.o: mallocr.c +$(lpfx)malignr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MEMALIGN -c $< -o $@ -$(lpfx)vallocr.o: mallocr.c +$(lpfx)vallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_VALLOC -c $< -o $@ -$(lpfx)pvallocr.o: mallocr.c +$(lpfx)pvallocr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_PVALLOC -c $< -o $@ -$(lpfx)mallinfor.o: mallocr.c +$(lpfx)mallinfor.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLINFO -c $< -o $@ -$(lpfx)mallstatsr.o: mallocr.c +$(lpfx)mallstatsr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_STATS -c $< -o $@ -$(lpfx)msizer.o: mallocr.c +$(lpfx)msizer.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $< -o $@ -$(lpfx)malloptr.o: mallocr.c +$(lpfx)malloptr.o: _mallocr.c $(LIB_COMPILE) -DDEFINE_MALLOPT -c $< -o $@ $(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