Module Name: src
Committed By: christos
Date: Sat Oct 26 17:57:20 UTC 2019
Modified Files:
src/lib/libm/arch/m68k: fenv.c
src/lib/libm/src: namespace.h
Log Message:
Separate the NetBSD-specific fenv functions from the standard ones.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/arch/m68k/fenv.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libm/src/namespace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/arch/m68k/fenv.c
diff -u src/lib/libm/arch/m68k/fenv.c:1.2 src/lib/libm/arch/m68k/fenv.c:1.3
--- src/lib/libm/arch/m68k/fenv.c:1.2 Wed Mar 22 19:11:08 2017
+++ src/lib/libm/arch/m68k/fenv.c Sat Oct 26 13:57:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.2 2017/03/22 23:11:08 chs Exp $ */
+/* $NetBSD: fenv.c,v 1.3 2019/10/26 17:57:20 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.2 2017/03/22 23:11:08 chs Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.3 2019/10/26 17:57:20 christos Exp $");
#include "namespace.h"
@@ -38,10 +38,7 @@ __RCSID("$NetBSD: fenv.c,v 1.2 2017/03/2
#ifdef __weak_alias
__weak_alias(feclearexcept,_feclearexcept)
-__weak_alias(fedisableexcept,_fedisableexcept)
-__weak_alias(feenableexcept,_feenableexcept)
__weak_alias(fegetenv,_fegetenv)
-__weak_alias(fegetexcept,_fegetexcept)
__weak_alias(fegetexceptflag,_fegetexceptflag)
__weak_alias(fegetround,_fegetround)
__weak_alias(feholdexcept,_feholdexcept)
@@ -51,6 +48,10 @@ __weak_alias(fesetexceptflag,_fesetexcep
__weak_alias(fesetround,_fesetround)
__weak_alias(fetestexcept,_fetestexcept)
__weak_alias(feupdateenv,_feupdateenv)
+
+__weak_alias(fedisableexcept,_fedisableexcept)
+__weak_alias(feenableexcept,_feenableexcept)
+__weak_alias(fegetexcept,_fegetexcept)
#endif
#if defined(__GNUC_GNU_INLINE__) && !defined(__lint__)
@@ -68,6 +69,7 @@ extern inline int fegetenv(fenv_t *__env
extern inline int feholdexcept(fenv_t *__envp);
extern inline int fesetenv(const fenv_t *__envp);
extern inline int feupdateenv(const fenv_t *__envp);
+
extern inline int feenableexcept(int __excepts);
extern inline int fedisableexcept(int __excepts);
extern inline int fegetexcept(void);
Index: src/lib/libm/src/namespace.h
diff -u src/lib/libm/src/namespace.h:1.14 src/lib/libm/src/namespace.h:1.15
--- src/lib/libm/src/namespace.h:1.14 Wed Mar 22 19:11:09 2017
+++ src/lib/libm/src/namespace.h Sat Oct 26 13:57:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.14 2017/03/22 23:11:09 chs Exp $ */
+/* $NetBSD: namespace.h,v 1.15 2019/10/26 17:57:20 christos Exp $ */
#define atan2 _atan2
#define atan2f _atan2f
@@ -75,10 +75,7 @@
#define erfcl _erfcl
#define feclearexcept _feclearexcept
-#define fedisableexcept _fedisableexcept
-#define feenableexcept _feenableexcept
#define fegetenv _fegetenv
-#define fegetexcept _fegetexcept
#define fegetexceptflag _fegetexceptflag
#define fegetround _fegetround
#define feholdexcept _feholdexcept
@@ -88,3 +85,7 @@
#define fesetround _fesetround
#define fetestexcept _fetestexcept
#define feupdateenv _feupdateenv
+
+#define fedisableexcept _fedisableexcept
+#define feenableexcept _feenableexcept
+#define fegetexcept _fegetexcept
