From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id CF0C8384A87E; Wed, 2 Sep 2020 08:05:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF0C8384A87E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libm/machine/arm: Rename s*_fma.c -> s*_fma_arm.c X-Act-Checkin: newlib-cygwin X-Git-Author: Keith Packard via Newlib X-Git-Refname: refs/heads/master X-Git-Oldrev: 7c4719f548b5b959ed82e2992d77d04e7e7836ef X-Git-Newrev: a634adda5af00c5936e3e7a5e2950c05c14981d3 Message-Id: <20200902080524.CF0C8384A87E@sourceware.org> Date: Wed, 2 Sep 2020 08:05:24 +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, 02 Sep 2020 08:05:24 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a634adda5af00c5936e3e7a5e2950c05c14981d3 commit a634adda5af00c5936e3e7a5e2950c05c14981d3 Author: Keith Packard via Newlib Date: Tue Sep 1 12:49:49 2020 -0700 libm/machine/arm: Rename s*_fma.c -> s*_fma_arm.c This is required to avoid colliding with files built from libm/common that would end up with the same object name. When libm.a was constructed from the individual sub-libraries, the contents of the libm/common files would be replaced by that from libm/machine/arm with the same name. Signed-off-by: Keith Packard Diff: --- newlib/libm/machine/arm/Makefile.am | 4 ++-- newlib/libm/machine/arm/Makefile.in | 24 +++++++++++----------- newlib/libm/machine/arm/{s_fma.c => s_fma_arm.c} | 0 newlib/libm/machine/arm/{sf_fma.c => sf_fma_arm.c} | 0 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am index 09a266c43..ccb134d6a 100644 --- a/newlib/libm/machine/arm/Makefile.am +++ b/newlib/libm/machine/arm/Makefile.am @@ -10,14 +10,14 @@ LIB_SOURCES = \ ef_sqrt.c \ s_ceil.c \ s_floor.c \ - s_fma.c \ + s_fma_arm.c \ s_nearbyint.c \ s_rint.c \ s_round.c \ s_trunc.c \ sf_ceil.c \ sf_floor.c \ - sf_fma.c \ + sf_fma_arm.c \ sf_nearbyint.c \ sf_rint.c \ sf_round.c \ diff --git a/newlib/libm/machine/arm/Makefile.in b/newlib/libm/machine/arm/Makefile.in index e7bca5f66..49c536d1c 100644 --- a/newlib/libm/machine/arm/Makefile.in +++ b/newlib/libm/machine/arm/Makefile.in @@ -72,10 +72,10 @@ lib_a_AR = $(AR) $(ARFLAGS) lib_a_LIBADD = am__objects_1 = lib_a-e_sqrt.$(OBJEXT) lib_a-ef_sqrt.$(OBJEXT) \ lib_a-s_ceil.$(OBJEXT) lib_a-s_floor.$(OBJEXT) \ - lib_a-s_fma.$(OBJEXT) lib_a-s_nearbyint.$(OBJEXT) \ + lib_a-s_fma_arm.$(OBJEXT) lib_a-s_nearbyint.$(OBJEXT) \ lib_a-s_rint.$(OBJEXT) lib_a-s_round.$(OBJEXT) \ lib_a-s_trunc.$(OBJEXT) lib_a-sf_ceil.$(OBJEXT) \ - lib_a-sf_floor.$(OBJEXT) lib_a-sf_fma.$(OBJEXT) \ + lib_a-sf_floor.$(OBJEXT) lib_a-sf_fma_arm.$(OBJEXT) \ lib_a-sf_nearbyint.$(OBJEXT) lib_a-sf_rint.$(OBJEXT) \ lib_a-sf_round.$(OBJEXT) lib_a-sf_trunc.$(OBJEXT) \ lib_a-feclearexcept.$(OBJEXT) lib_a-fe_dfl_env.$(OBJEXT) \ @@ -216,14 +216,14 @@ LIB_SOURCES = \ ef_sqrt.c \ s_ceil.c \ s_floor.c \ - s_fma.c \ + s_fma_arm.c \ s_nearbyint.c \ s_rint.c \ s_round.c \ s_trunc.c \ sf_ceil.c \ sf_floor.c \ - sf_fma.c \ + sf_fma_arm.c \ sf_nearbyint.c \ sf_rint.c \ sf_round.c \ @@ -344,11 +344,11 @@ lib_a-s_floor.o: s_floor.c lib_a-s_floor.obj: s_floor.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-s_floor.obj `if test -f 's_floor.c'; then $(CYGPATH_W) 's_floor.c'; else $(CYGPATH_W) '$(srcdir)/s_floor.c'; fi` -lib_a-s_fma.o: s_fma.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-s_fma.o `test -f 's_fma.c' || echo '$(srcdir)/'`s_fma.c +lib_a-s_fma_arm.o: s_fma_arm.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-s_fma_arm.o `test -f 's_fma_arm.c' || echo '$(srcdir)/'`s_fma_arm.c -lib_a-s_fma.obj: s_fma.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-s_fma.obj `if test -f 's_fma.c'; then $(CYGPATH_W) 's_fma.c'; else $(CYGPATH_W) '$(srcdir)/s_fma.c'; fi` +lib_a-s_fma_arm.obj: s_fma_arm.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-s_fma_arm.obj `if test -f 's_fma_arm.c'; then $(CYGPATH_W) 's_fma_arm.c'; else $(CYGPATH_W) '$(srcdir)/s_fma_arm.c'; fi` lib_a-s_nearbyint.o: s_nearbyint.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-s_nearbyint.o `test -f 's_nearbyint.c' || echo '$(srcdir)/'`s_nearbyint.c @@ -386,11 +386,11 @@ lib_a-sf_floor.o: sf_floor.c lib_a-sf_floor.obj: sf_floor.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_floor.obj `if test -f 'sf_floor.c'; then $(CYGPATH_W) 'sf_floor.c'; else $(CYGPATH_W) '$(srcdir)/sf_floor.c'; fi` -lib_a-sf_fma.o: sf_fma.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_fma.o `test -f 'sf_fma.c' || echo '$(srcdir)/'`sf_fma.c +lib_a-sf_fma_arm.o: sf_fma_arm.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_fma_arm.o `test -f 'sf_fma_arm.c' || echo '$(srcdir)/'`sf_fma_arm.c -lib_a-sf_fma.obj: sf_fma.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_fma.obj `if test -f 'sf_fma.c'; then $(CYGPATH_W) 'sf_fma.c'; else $(CYGPATH_W) '$(srcdir)/sf_fma.c'; fi` +lib_a-sf_fma_arm.obj: sf_fma_arm.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_fma_arm.obj `if test -f 'sf_fma_arm.c'; then $(CYGPATH_W) 'sf_fma_arm.c'; else $(CYGPATH_W) '$(srcdir)/sf_fma_arm.c'; fi` lib_a-sf_nearbyint.o: sf_nearbyint.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_nearbyint.o `test -f 'sf_nearbyint.c' || echo '$(srcdir)/'`sf_nearbyint.c diff --git a/newlib/libm/machine/arm/s_fma.c b/newlib/libm/machine/arm/s_fma_arm.c similarity index 100% rename from newlib/libm/machine/arm/s_fma.c rename to newlib/libm/machine/arm/s_fma_arm.c diff --git a/newlib/libm/machine/arm/sf_fma.c b/newlib/libm/machine/arm/sf_fma_arm.c similarity index 100% rename from newlib/libm/machine/arm/sf_fma.c rename to newlib/libm/machine/arm/sf_fma_arm.c