From: Keith Packard <keithp@keithp.com>
To: newlib@sourceware.org
Subject: [PATCH] libm/machine/arm: Rename s*_fma.c -> s*_fma_arm.c
Date: Tue, 1 Sep 2020 12:49:49 -0700 [thread overview]
Message-ID: <20200901194949.830682-1-keithp@keithp.com> (raw)
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 <keithp@keithp.com>
---
newlib/libm/machine/arm/Makefile.am | 4 ++--
newlib/libm/machine/arm/Makefile.in | 24 +++++++++----------
.../libm/machine/arm/{s_fma.c => s_fma_arm.c} | 0
.../machine/arm/{sf_fma.c => sf_fma_arm.c} | 0
4 files changed, 14 insertions(+), 14 deletions(-)
rename newlib/libm/machine/arm/{s_fma.c => s_fma_arm.c} (100%)
rename newlib/libm/machine/arm/{sf_fma.c => sf_fma_arm.c} (100%)
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
--
2.28.0
next reply other threads:[~2020-09-01 19:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 19:49 Keith Packard [this message]
2020-09-02 4:44 ` Sebastian Huber
2020-09-02 5:24 ` Sebastian Huber
2020-09-02 5:26 ` Keith Packard
2020-09-02 8:05 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200901194949.830682-1-keithp@keithp.com \
--to=keithp@keithp.com \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).