[2/2] arm: Remove superfluous fenv stub files

Message ID 20200719110112.14255-3-sebastian.huber@embedded-brains.de
State New
Headers show
Series
  • Fix fenv support for ARM
Related show

Commit Message

Sebastian Huber July 19, 2020, 11:01 a.m.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>

---
 newlib/libm/machine/arm/Makefile.am       | 15 +---
 newlib/libm/machine/arm/Makefile.in       | 94 +----------------------
 newlib/libm/machine/arm/fe_dfl_env.c      |  7 --
 newlib/libm/machine/arm/feclearexcept.c   |  7 --
 newlib/libm/machine/arm/fegetenv.c        |  7 --
 newlib/libm/machine/arm/fegetexceptflag.c |  7 --
 newlib/libm/machine/arm/fegetround.c      |  7 --
 newlib/libm/machine/arm/feholdexcept.c    |  7 --
 newlib/libm/machine/arm/feraiseexcept.c   |  7 --
 newlib/libm/machine/arm/fesetenv.c        |  7 --
 newlib/libm/machine/arm/fesetexceptflag.c |  7 --
 newlib/libm/machine/arm/fesetround.c      |  7 --
 newlib/libm/machine/arm/fetestexcept.c    |  7 --
 newlib/libm/machine/arm/feupdateenv.c     |  7 --
 14 files changed, 3 insertions(+), 190 deletions(-)
 delete mode 100644 newlib/libm/machine/arm/fe_dfl_env.c
 delete mode 100644 newlib/libm/machine/arm/feclearexcept.c
 delete mode 100644 newlib/libm/machine/arm/fegetenv.c
 delete mode 100644 newlib/libm/machine/arm/fegetexceptflag.c
 delete mode 100644 newlib/libm/machine/arm/fegetround.c
 delete mode 100644 newlib/libm/machine/arm/feholdexcept.c
 delete mode 100644 newlib/libm/machine/arm/feraiseexcept.c
 delete mode 100644 newlib/libm/machine/arm/fesetenv.c
 delete mode 100644 newlib/libm/machine/arm/fesetexceptflag.c
 delete mode 100644 newlib/libm/machine/arm/fesetround.c
 delete mode 100644 newlib/libm/machine/arm/fetestexcept.c
 delete mode 100644 newlib/libm/machine/arm/feupdateenv.c

-- 
2.26.2

Patch

diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index 180a37f44..50b29a063 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -20,20 +20,7 @@  LIB_SOURCES = \
 	sf_rint.c \
 	sf_round.c \
 	sf_trunc.c \
-	feclearexcept.c \
-	fe_dfl_env.c\
-	fegetenv.c \
-	fegetexceptflag.c \
-	fegetround.c \
-	feholdexcept.c \
-	fenv.c \
-	feraiseexcept.c \
-	fesetenv.c \
-	fesetexceptflag.c \
-	fesetround.c \
-	fetestexcept.c \
-	feupdateenv.c
-
+	fenv.c
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
diff --git a/newlib/libm/machine/arm/Makefile.in b/newlib/libm/machine/arm/Makefile.in
index aa23dd4d5..2b831f232 100644
--- a/newlib/libm/machine/arm/Makefile.in
+++ b/newlib/libm/machine/arm/Makefile.in
@@ -77,13 +77,7 @@  am__objects_1 = lib_a-e_sqrt.$(OBJEXT) lib_a-ef_sqrt.$(OBJEXT) \
 	lib_a-sf_ceil.$(OBJEXT) lib_a-sf_floor.$(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) \
-	lib_a-fegetenv.$(OBJEXT) lib_a-fegetexceptflag.$(OBJEXT) \
-	lib_a-fegetround.$(OBJEXT) lib_a-feholdexcept.$(OBJEXT) \
-	lib_a-fenv.$(OBJEXT) lib_a-feraiseexcept.$(OBJEXT) \
-	lib_a-fesetenv.$(OBJEXT) lib_a-fesetexceptflag.$(OBJEXT) \
-	lib_a-fesetround.$(OBJEXT) lib_a-fetestexcept.$(OBJEXT) \
-	lib_a-feupdateenv.$(OBJEXT)
+	lib_a-fenv.$(OBJEXT)
 am_lib_a_OBJECTS = $(am__objects_1)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -224,19 +218,7 @@  LIB_SOURCES = \
 	sf_rint.c \
 	sf_round.c \
 	sf_trunc.c \
-	feclearexcept.c \
-	fe_dfl_env.c\
-	fegetenv.c \
-	fegetexceptflag.c \
-	fegetround.c \
-	feholdexcept.c \
-	fenv.c \
-	feraiseexcept.c \
-	fesetenv.c \
-	fesetexceptflag.c \
-	fesetround.c \
-	fetestexcept.c \
-	feupdateenv.c
+	fenv.c
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
@@ -398,84 +380,12 @@  lib_a-sf_trunc.o: sf_trunc.c
 lib_a-sf_trunc.obj: sf_trunc.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sf_trunc.obj `if test -f 'sf_trunc.c'; then $(CYGPATH_W) 'sf_trunc.c'; else $(CYGPATH_W) '$(srcdir)/sf_trunc.c'; fi`
 
-lib_a-feclearexcept.o: feclearexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feclearexcept.o `test -f 'feclearexcept.c' || echo '$(srcdir)/'`feclearexcept.c
-
-lib_a-feclearexcept.obj: feclearexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feclearexcept.obj `if test -f 'feclearexcept.c'; then $(CYGPATH_W) 'feclearexcept.c'; else $(CYGPATH_W) '$(srcdir)/feclearexcept.c'; fi`
-
-lib_a-fe_dfl_env.o: fe_dfl_env.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fe_dfl_env.o `test -f 'fe_dfl_env.c' || echo '$(srcdir)/'`fe_dfl_env.c
-
-lib_a-fe_dfl_env.obj: fe_dfl_env.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fe_dfl_env.obj `if test -f 'fe_dfl_env.c'; then $(CYGPATH_W) 'fe_dfl_env.c'; else $(CYGPATH_W) '$(srcdir)/fe_dfl_env.c'; fi`
-
-lib_a-fegetenv.o: fegetenv.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetenv.o `test -f 'fegetenv.c' || echo '$(srcdir)/'`fegetenv.c
-
-lib_a-fegetenv.obj: fegetenv.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetenv.obj `if test -f 'fegetenv.c'; then $(CYGPATH_W) 'fegetenv.c'; else $(CYGPATH_W) '$(srcdir)/fegetenv.c'; fi`
-
-lib_a-fegetexceptflag.o: fegetexceptflag.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetexceptflag.o `test -f 'fegetexceptflag.c' || echo '$(srcdir)/'`fegetexceptflag.c
-
-lib_a-fegetexceptflag.obj: fegetexceptflag.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetexceptflag.obj `if test -f 'fegetexceptflag.c'; then $(CYGPATH_W) 'fegetexceptflag.c'; else $(CYGPATH_W) '$(srcdir)/fegetexceptflag.c'; fi`
-
-lib_a-fegetround.o: fegetround.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetround.o `test -f 'fegetround.c' || echo '$(srcdir)/'`fegetround.c
-
-lib_a-fegetround.obj: fegetround.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetround.obj `if test -f 'fegetround.c'; then $(CYGPATH_W) 'fegetround.c'; else $(CYGPATH_W) '$(srcdir)/fegetround.c'; fi`
-
-lib_a-feholdexcept.o: feholdexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feholdexcept.o `test -f 'feholdexcept.c' || echo '$(srcdir)/'`feholdexcept.c
-
-lib_a-feholdexcept.obj: feholdexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feholdexcept.obj `if test -f 'feholdexcept.c'; then $(CYGPATH_W) 'feholdexcept.c'; else $(CYGPATH_W) '$(srcdir)/feholdexcept.c'; fi`
-
 lib_a-fenv.o: fenv.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fenv.o `test -f 'fenv.c' || echo '$(srcdir)/'`fenv.c
 
 lib_a-fenv.obj: fenv.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fenv.obj `if test -f 'fenv.c'; then $(CYGPATH_W) 'fenv.c'; else $(CYGPATH_W) '$(srcdir)/fenv.c'; fi`
 
-lib_a-feraiseexcept.o: feraiseexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feraiseexcept.o `test -f 'feraiseexcept.c' || echo '$(srcdir)/'`feraiseexcept.c
-
-lib_a-feraiseexcept.obj: feraiseexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feraiseexcept.obj `if test -f 'feraiseexcept.c'; then $(CYGPATH_W) 'feraiseexcept.c'; else $(CYGPATH_W) '$(srcdir)/feraiseexcept.c'; fi`
-
-lib_a-fesetenv.o: fesetenv.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fesetenv.o `test -f 'fesetenv.c' || echo '$(srcdir)/'`fesetenv.c
-
-lib_a-fesetenv.obj: fesetenv.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fesetenv.obj `if test -f 'fesetenv.c'; then $(CYGPATH_W) 'fesetenv.c'; else $(CYGPATH_W) '$(srcdir)/fesetenv.c'; fi`
-
-lib_a-fesetexceptflag.o: fesetexceptflag.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fesetexceptflag.o `test -f 'fesetexceptflag.c' || echo '$(srcdir)/'`fesetexceptflag.c
-
-lib_a-fesetexceptflag.obj: fesetexceptflag.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fesetexceptflag.obj `if test -f 'fesetexceptflag.c'; then $(CYGPATH_W) 'fesetexceptflag.c'; else $(CYGPATH_W) '$(srcdir)/fesetexceptflag.c'; fi`
-
-lib_a-fesetround.o: fesetround.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fesetround.o `test -f 'fesetround.c' || echo '$(srcdir)/'`fesetround.c
-
-lib_a-fesetround.obj: fesetround.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fesetround.obj `if test -f 'fesetround.c'; then $(CYGPATH_W) 'fesetround.c'; else $(CYGPATH_W) '$(srcdir)/fesetround.c'; fi`
-
-lib_a-fetestexcept.o: fetestexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fetestexcept.o `test -f 'fetestexcept.c' || echo '$(srcdir)/'`fetestexcept.c
-
-lib_a-fetestexcept.obj: fetestexcept.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fetestexcept.obj `if test -f 'fetestexcept.c'; then $(CYGPATH_W) 'fetestexcept.c'; else $(CYGPATH_W) '$(srcdir)/fetestexcept.c'; fi`
-
-lib_a-feupdateenv.o: feupdateenv.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feupdateenv.o `test -f 'feupdateenv.c' || echo '$(srcdir)/'`feupdateenv.c
-
-lib_a-feupdateenv.obj: feupdateenv.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feupdateenv.obj `if test -f 'feupdateenv.c'; then $(CYGPATH_W) 'feupdateenv.c'; else $(CYGPATH_W) '$(srcdir)/feupdateenv.c'; fi`
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
diff --git a/newlib/libm/machine/arm/fe_dfl_env.c b/newlib/libm/machine/arm/fe_dfl_env.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fe_dfl_env.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/feclearexcept.c b/newlib/libm/machine/arm/feclearexcept.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/feclearexcept.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fegetenv.c b/newlib/libm/machine/arm/fegetenv.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fegetenv.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fegetexceptflag.c b/newlib/libm/machine/arm/fegetexceptflag.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fegetexceptflag.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fegetround.c b/newlib/libm/machine/arm/fegetround.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fegetround.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/feholdexcept.c b/newlib/libm/machine/arm/feholdexcept.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/feholdexcept.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/feraiseexcept.c b/newlib/libm/machine/arm/feraiseexcept.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/feraiseexcept.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fesetenv.c b/newlib/libm/machine/arm/fesetenv.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fesetenv.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fesetexceptflag.c b/newlib/libm/machine/arm/fesetexceptflag.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fesetexceptflag.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fesetround.c b/newlib/libm/machine/arm/fesetround.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fesetround.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/fetestexcept.c b/newlib/libm/machine/arm/fetestexcept.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/fetestexcept.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"
diff --git a/newlib/libm/machine/arm/feupdateenv.c b/newlib/libm/machine/arm/feupdateenv.c
deleted file mode 100644
index 8cbee7771..000000000
--- a/newlib/libm/machine/arm/feupdateenv.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * (c) Copyright 2019 Joel Sherrill <joel@rtems.org>
- */
-
-#include "../../fenv/fenv_stub.c"