[PATCH v2 2/2] break fenv.c file to function files
Eshan dhawan
eshandhawan51 at gmail.com
Sat Jul 25 17:15:34 UTC 2020
Signed-off-by: Eshan dhawan <eshandhawan51 at gmail.com>
---
newlib/libc/machine/arm/sys/fenv.h | 8 +
newlib/libm/machine/arm/Makefile.am | 6 +-
newlib/libm/machine/arm/Makefile.in | 34 +++-
newlib/libm/machine/arm/fe_dfl_env.c | 38 +++-
newlib/libm/machine/arm/feclearexcept.c | 45 ++++-
newlib/libm/machine/arm/fedisableexcept.c | 47 +++++
newlib/libm/machine/arm/feenableexcept.c | 48 +++++
newlib/libm/machine/arm/fegetenv.c | 42 +++-
newlib/libm/machine/arm/fegetexcept.c | 44 +++++
newlib/libm/machine/arm/fegetexceptflag.c | 46 ++++-
newlib/libm/machine/arm/fegetround.c | 49 ++++-
newlib/libm/machine/arm/feholdexcept.c | 47 ++++-
newlib/libm/machine/arm/fenv.c | 223 ----------------------
newlib/libm/machine/arm/feraiseexcept.c | 44 ++++-
newlib/libm/machine/arm/fesetenv.c | 43 ++++-
newlib/libm/machine/arm/fesetexceptflag.c | 47 ++++-
newlib/libm/machine/arm/fesetround.c | 46 ++++-
newlib/libm/machine/arm/fetestexcept.c | 45 ++++-
newlib/libm/machine/arm/feupdateenv.c | 50 ++++-
19 files changed, 670 insertions(+), 282 deletions(-)
create mode 100644 newlib/libm/machine/arm/fedisableexcept.c
create mode 100644 newlib/libm/machine/arm/feenableexcept.c
create mode 100644 newlib/libm/machine/arm/fegetexcept.c
delete mode 100644 newlib/libm/machine/arm/fenv.c
diff --git a/newlib/libc/machine/arm/sys/fenv.h b/newlib/libc/machine/arm/sys/fenv.h
index 70bd57be4..8712b2f33 100644
--- a/newlib/libc/machine/arm/sys/fenv.h
+++ b/newlib/libc/machine/arm/sys/fenv.h
@@ -62,6 +62,14 @@ typedef int fexcept_t;
#define FE_DOWNWARD 0x00800000
#define FE_TOWARDZERO 0x00c00000
+#ifndef __SOFTFP__
+#define vmrs_fpscr(__r) __asm __volatile("vmrs %0, fpscr" : "=&r"(__r))
+#define vmsr_fpscr(__r) __asm __volatile("vmsr fpscr, %0" : : "r"(__r))
+#define _FPU_MASK_SHIFT 8
+#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
+ FE_UPWARD | FE_TOWARDZERO)
+#endif
+
/* Default floating-point environment */
extern const fenv_t *_fe_dfl_env;
#define FE_DFL_ENV (_fe_dfl_env)
diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index 180a37f44..6574c56c9 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -26,13 +26,15 @@ LIB_SOURCES = \
fegetexceptflag.c \
fegetround.c \
feholdexcept.c \
- fenv.c \
+ fegetexcept.c \
feraiseexcept.c \
fesetenv.c \
fesetexceptflag.c \
fesetround.c \
fetestexcept.c \
- feupdateenv.c
+ feupdateenv.c \
+ feenableexcept.c \
+ fedisableexcept.c
noinst_LIBRARIES = lib.a
diff --git a/newlib/libm/machine/arm/Makefile.in b/newlib/libm/machine/arm/Makefile.in
index aa23dd4d5..63de93443 100644
--- a/newlib/libm/machine/arm/Makefile.in
+++ b/newlib/libm/machine/arm/Makefile.in
@@ -54,7 +54,8 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/../../../Makefile.shared $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
+ $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \
+ $(srcdir)/../../../../mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
@@ -80,10 +81,11 @@ am__objects_1 = lib_a-e_sqrt.$(OBJEXT) lib_a-ef_sqrt.$(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-fegetexcept.$(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-feupdateenv.$(OBJEXT) lib_a-feenableexcept.$(OBJEXT) \
+ lib_a-fedisableexcept.$(OBJEXT)
am_lib_a_OBJECTS = $(am__objects_1)
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
DEFAULT_INCLUDES = -I. at am__isrc@
@@ -230,13 +232,15 @@ LIB_SOURCES = \
fegetexceptflag.c \
fegetround.c \
feholdexcept.c \
- fenv.c \
+ fegetexcept.c \
feraiseexcept.c \
fesetenv.c \
fesetexceptflag.c \
fesetround.c \
fetestexcept.c \
- feupdateenv.c
+ feupdateenv.c \
+ feenableexcept.c \
+ fedisableexcept.c
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
@@ -434,11 +438,11 @@ lib_a-feholdexcept.o: 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-fegetexcept.o: fegetexcept.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetexcept.o `test -f 'fegetexcept.c' || echo '$(srcdir)/'`fegetexcept.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-fegetexcept.obj: fegetexcept.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fegetexcept.obj `if test -f 'fegetexcept.c'; then $(CYGPATH_W) 'fegetexcept.c'; else $(CYGPATH_W) '$(srcdir)/fegetexcept.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
@@ -476,6 +480,18 @@ lib_a-feupdateenv.o: 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`
+lib_a-feenableexcept.o: feenableexcept.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feenableexcept.o `test -f 'feenableexcept.c' || echo '$(srcdir)/'`feenableexcept.c
+
+lib_a-feenableexcept.obj: feenableexcept.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-feenableexcept.obj `if test -f 'feenableexcept.c'; then $(CYGPATH_W) 'feenableexcept.c'; else $(CYGPATH_W) '$(srcdir)/feenableexcept.c'; fi`
+
+lib_a-fedisableexcept.o: fedisableexcept.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fedisableexcept.o `test -f 'fedisableexcept.c' || echo '$(srcdir)/'`fedisableexcept.c
+
+lib_a-fedisableexcept.obj: fedisableexcept.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fedisableexcept.obj `if test -f 'fedisableexcept.c'; then $(CYGPATH_W) 'fedisableexcept.c'; else $(CYGPATH_W) '$(srcdir)/fedisableexcept.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
index 8cbee7771..07aee8e7c 100644
--- a/newlib/libm/machine/arm/fe_dfl_env.c
+++ b/newlib/libm/machine/arm/fe_dfl_env.c
@@ -1,7 +1,37 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+ fenv_t __fe_dfl_env = { 0 };
+
+ const fenv_t *_fe_dfl_env = &__fe_dfl_env;
+
diff --git a/newlib/libm/machine/arm/feclearexcept.c b/newlib/libm/machine/arm/feclearexcept.c
index 8cbee7771..4a849b3b3 100644
--- a/newlib/libm/machine/arm/feclearexcept.c
+++ b/newlib/libm/machine/arm/feclearexcept.c
@@ -1,7 +1,44 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int feclearexcept(int excepts)
+{
+#ifndef __SOFTFP__
+ fexcept_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ __fpsr &= ~excepts;
+ vmsr_fpscr(__fpsr);
+#endif
+ return (0);
+}
diff --git a/newlib/libm/machine/arm/fedisableexcept.c b/newlib/libm/machine/arm/fedisableexcept.c
new file mode 100644
index 000000000..84bddc406
--- /dev/null
+++ b/newlib/libm/machine/arm/fedisableexcept.c
@@ -0,0 +1,47 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <fenv.h>
+
+int fedisableexcept(int __mask)
+{
+#ifndef __SOFTFP__
+ fenv_t __old_fpsr, __new_fpsr;
+
+ vmrs_fpscr(__old_fpsr);
+ __new_fpsr = __old_fpsr &
+ ~((__mask & FE_ALL_EXCEPT) << _FPU_MASK_SHIFT);
+ vmsr_fpscr(__new_fpsr);
+ return ((__old_fpsr >> _FPU_MASK_SHIFT) & FE_ALL_EXCEPT);
+#else
+ return (0);
+#endif
+}
diff --git a/newlib/libm/machine/arm/feenableexcept.c b/newlib/libm/machine/arm/feenableexcept.c
new file mode 100644
index 000000000..ecd18bf9b
--- /dev/null
+++ b/newlib/libm/machine/arm/feenableexcept.c
@@ -0,0 +1,48 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <fenv.h>
+
+int feenableexcept(int __mask)
+{
+#ifndef __SOFTFP__
+ fenv_t __old_fpsr, __new_fpsr;
+
+ vmrs_fpscr(__old_fpsr);
+ __new_fpsr = __old_fpsr |
+ ((__mask & FE_ALL_EXCEPT) << _FPU_MASK_SHIFT);
+ vmsr_fpscr(__new_fpsr);
+ return ((__old_fpsr >> _FPU_MASK_SHIFT) & FE_ALL_EXCEPT);
+#else
+ return (0);
+#endif
+}
+
diff --git a/newlib/libm/machine/arm/fegetenv.c b/newlib/libm/machine/arm/fegetenv.c
index 8cbee7771..d03e77aff 100644
--- a/newlib/libm/machine/arm/fegetenv.c
+++ b/newlib/libm/machine/arm/fegetenv.c
@@ -1,7 +1,41 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fegetenv(fenv_t *envp)
+{
+
+#ifndef __SOFTFP__
+ vmrs_fpscr(*envp);
+#endif
+ return (0);
+}
diff --git a/newlib/libm/machine/arm/fegetexcept.c b/newlib/libm/machine/arm/fegetexcept.c
new file mode 100644
index 000000000..7a0ba9949
--- /dev/null
+++ b/newlib/libm/machine/arm/fegetexcept.c
@@ -0,0 +1,44 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <fenv.h>
+
+int fegetexcept(void)
+{
+#ifndef __SOFTFP__
+ fenv_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ return (__fpsr & FE_ALL_EXCEPT);
+#else
+ return (0);
+#endif
+}
diff --git a/newlib/libm/machine/arm/fegetexceptflag.c b/newlib/libm/machine/arm/fegetexceptflag.c
index 8cbee7771..25370ad64 100644
--- a/newlib/libm/machine/arm/fegetexceptflag.c
+++ b/newlib/libm/machine/arm/fegetexceptflag.c
@@ -1,7 +1,45 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fegetexceptflag(fexcept_t *flagp, int excepts)
+{
+#ifndef __SOFTFP__
+ fexcept_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ __fpsr &= ~excepts;
+ __fpsr |= *flagp & excepts;
+ vmsr_fpscr(__fpsr);
+#endif
+ return (0);
+}
diff --git a/newlib/libm/machine/arm/fegetround.c b/newlib/libm/machine/arm/fegetround.c
index 8cbee7771..6ac32f82e 100644
--- a/newlib/libm/machine/arm/fegetround.c
+++ b/newlib/libm/machine/arm/fegetround.c
@@ -1,7 +1,48 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fegetround(void)
+{
+#ifndef __SOFTFP__
+ fenv_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ return (__fpsr & _ROUND_MASK);
+#else
+#ifdef FE_TONEAREST
+ return (FE_TONEAREST);
+#else
+ return (0);
+#endif
+#endif
+}
diff --git a/newlib/libm/machine/arm/feholdexcept.c b/newlib/libm/machine/arm/feholdexcept.c
index 8cbee7771..62067c1b7 100644
--- a/newlib/libm/machine/arm/feholdexcept.c
+++ b/newlib/libm/machine/arm/feholdexcept.c
@@ -1,7 +1,46 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int feholdexcept(fenv_t *envp)
+{
+#ifndef __SOFTFP__
+ fenv_t __env;
+
+ vmrs_fpscr(__env);
+ *envp = __env;
+ __env &= ~(FE_ALL_EXCEPT);
+ vmsr_fpscr(__env);
+#endif
+ return (0);
+}
+
diff --git a/newlib/libm/machine/arm/fenv.c b/newlib/libm/machine/arm/fenv.c
deleted file mode 100644
index 0735cd1c5..000000000
--- a/newlib/libm/machine/arm/fenv.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
- * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <fenv.h>
-
-#ifndef __SOFTFP__
-#define vmrs_fpscr(__r) __asm __volatile("vmrs %0, fpscr" : "=&r"(__r))
-#define vmsr_fpscr(__r) __asm __volatile("vmsr fpscr, %0" : : "r"(__r))
-#define _FPU_MASK_SHIFT 8
-#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
- FE_UPWARD | FE_TOWARDZERO)
-#endif
-
-fenv_t __fe_dfl_env = { 0 };
-
-const fenv_t *_fe_dfl_env = &__fe_dfl_env;
-
-int feclearexcept(int excepts)
-{
-#ifndef __SOFTFP__
- fexcept_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- __fpsr &= ~excepts;
- vmsr_fpscr(__fpsr);
-#endif
- return (0);
-}
-
-int fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-#ifndef __SOFTFP__
- fexcept_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- __fpsr &= ~excepts;
- __fpsr |= *flagp & excepts;
- vmsr_fpscr(__fpsr);
-#endif
- return (0);
-}
-
-int fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-#ifndef __SOFTFP__
- fexcept_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- __fpsr &= ~excepts;
- __fpsr |= *flagp & excepts;
- vmsr_fpscr(__fpsr);
-#endif
- return (0);
-}
-
-int feraiseexcept(int excepts)
-{
-#ifndef __SOFTFP__
- fexcept_t __ex = excepts;
-
- fesetexceptflag(&__ex, excepts);
-#endif
- return (0);
-}
-
-int fetestexcept(int excepts)
-{
-#ifndef __SOFTFP__
- fexcept_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- return (__fpsr & excepts);
-#else
- return (0);
-#endif
-}
-
-int fegetround(void)
-{
-#ifndef __SOFTFP__
- fenv_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- return (__fpsr & _ROUND_MASK);
-#else
-#ifdef FE_TONEAREST
- return (FE_TONEAREST);
-#else
- return (0);
-#endif
-#endif
-}
-
-int fesetround(int round)
-{
-#ifndef __SOFTFP__
- fenv_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- __fpsr &= ~(_ROUND_MASK);
- __fpsr |= round;
- vmsr_fpscr(__fpsr);
-#endif
- return (0);
-}
-
-int fegetenv(fenv_t *envp)
-{
-
-#ifndef __SOFTFP__
- vmrs_fpscr(*envp);
-#endif
- return (0);
-}
-
-int feholdexcept(fenv_t *envp)
-{
-#ifndef __SOFTFP__
- fenv_t __env;
-
- vmrs_fpscr(__env);
- *envp = __env;
- __env &= ~(FE_ALL_EXCEPT);
- vmsr_fpscr(__env);
-#endif
- return (0);
-}
-
-int fesetenv(const fenv_t *envp)
-{
-
-#ifndef __SOFTFP__
- vmsr_fpscr(*envp);
-#endif
- return (0);
-}
-
-int feupdateenv(const fenv_t *envp)
-{
-#ifndef __SOFTFP__
- fexcept_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- vmsr_fpscr(*envp);
- feraiseexcept(__fpsr & FE_ALL_EXCEPT);
-#else
-#if defined(FE_NOMASK_ENV) && FE_ALL_EXCEPT != 0
- if (envp == FE_NOMASK_ENV)
- return (1);
-#endif
-#endif
- return (0);
-}
-
-int feenableexcept(int __mask)
-{
-#ifndef __SOFTFP__
- fenv_t __old_fpsr, __new_fpsr;
-
- vmrs_fpscr(__old_fpsr);
- __new_fpsr = __old_fpsr |
- ((__mask & FE_ALL_EXCEPT) << _FPU_MASK_SHIFT);
- vmsr_fpscr(__new_fpsr);
- return ((__old_fpsr >> _FPU_MASK_SHIFT) & FE_ALL_EXCEPT);
-#else
- return (0);
-#endif
-}
-
-int fedisableexcept(int __mask)
-{
-#ifndef __SOFTFP__
- fenv_t __old_fpsr, __new_fpsr;
-
- vmrs_fpscr(__old_fpsr);
- __new_fpsr = __old_fpsr &
- ~((__mask & FE_ALL_EXCEPT) << _FPU_MASK_SHIFT);
- vmsr_fpscr(__new_fpsr);
- return ((__old_fpsr >> _FPU_MASK_SHIFT) & FE_ALL_EXCEPT);
-#else
- return (0);
-#endif
-}
-
-int fegetexcept(void)
-{
-#ifndef __SOFTFP__
- fenv_t __fpsr;
-
- vmrs_fpscr(__fpsr);
- return (__fpsr & FE_ALL_EXCEPT);
-#else
- return (0);
-#endif
-}
diff --git a/newlib/libm/machine/arm/feraiseexcept.c b/newlib/libm/machine/arm/feraiseexcept.c
index 8cbee7771..a009264bc 100644
--- a/newlib/libm/machine/arm/feraiseexcept.c
+++ b/newlib/libm/machine/arm/feraiseexcept.c
@@ -1,7 +1,43 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int feraiseexcept(int excepts)
+{
+#ifndef __SOFTFP__
+ fexcept_t __ex = excepts;
+
+ fesetexceptflag(&__ex, excepts);
+#endif
+ return (0);
+}
+
diff --git a/newlib/libm/machine/arm/fesetenv.c b/newlib/libm/machine/arm/fesetenv.c
index 8cbee7771..5fbe8ca90 100644
--- a/newlib/libm/machine/arm/fesetenv.c
+++ b/newlib/libm/machine/arm/fesetenv.c
@@ -1,7 +1,42 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fesetenv(const fenv_t *envp)
+{
+
+#ifndef __SOFTFP__
+ vmsr_fpscr(*envp);
+#endif
+ return (0);
+}
+
diff --git a/newlib/libm/machine/arm/fesetexceptflag.c b/newlib/libm/machine/arm/fesetexceptflag.c
index 8cbee7771..331057ef5 100644
--- a/newlib/libm/machine/arm/fesetexceptflag.c
+++ b/newlib/libm/machine/arm/fesetexceptflag.c
@@ -1,7 +1,46 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fesetexceptflag(const fexcept_t *flagp, int excepts)
+{
+#ifndef __SOFTFP__
+ fexcept_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ __fpsr &= ~excepts;
+ __fpsr |= *flagp & excepts;
+ vmsr_fpscr(__fpsr);
+#endif
+ return (0);
+}
+
diff --git a/newlib/libm/machine/arm/fesetround.c b/newlib/libm/machine/arm/fesetround.c
index 8cbee7771..c803087bd 100644
--- a/newlib/libm/machine/arm/fesetround.c
+++ b/newlib/libm/machine/arm/fesetround.c
@@ -1,7 +1,45 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fesetround(int round)
+{
+#ifndef __SOFTFP__
+ fenv_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ __fpsr &= ~(_ROUND_MASK);
+ __fpsr |= round;
+ vmsr_fpscr(__fpsr);
+#endif
+ return (0);
+}
diff --git a/newlib/libm/machine/arm/fetestexcept.c b/newlib/libm/machine/arm/fetestexcept.c
index 8cbee7771..3f5a26d65 100644
--- a/newlib/libm/machine/arm/fetestexcept.c
+++ b/newlib/libm/machine/arm/fetestexcept.c
@@ -1,7 +1,44 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int fetestexcept(int excepts)
+{
+#ifndef __SOFTFP__
+ fexcept_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ return (__fpsr & excepts);
+#else
+ return (0);
+#endif
+}
diff --git a/newlib/libm/machine/arm/feupdateenv.c b/newlib/libm/machine/arm/feupdateenv.c
index 8cbee7771..84336cafd 100644
--- a/newlib/libm/machine/arm/feupdateenv.c
+++ b/newlib/libm/machine/arm/feupdateenv.c
@@ -1,7 +1,49 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
- * (c) Copyright 2019 Joel Sherrill <joel at rtems.org>
+ * Copyright (c) 2004-2005 David Schultz <das at FreeBSD.ORG>
+ * Copyright (c) 2013 Andrew Turner <andrew at FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include "../../fenv/fenv_stub.c"
+#include <fenv.h>
+
+int feupdateenv(const fenv_t *envp)
+{
+#ifndef __SOFTFP__
+ fexcept_t __fpsr;
+
+ vmrs_fpscr(__fpsr);
+ vmsr_fpscr(*envp);
+ feraiseexcept(__fpsr & FE_ALL_EXCEPT);
+#else
+#if defined(FE_NOMASK_ENV) && FE_ALL_EXCEPT != 0
+ if (envp == FE_NOMASK_ENV)
+ return (1);
+#endif
+#endif
+ return (0);
+}
--
2.17.1
More information about the devel
mailing list