Page MenuHomeFreeBSD
Files F163421932

D57450.id179226.diff
No OneTemporary
Actions

D57450.id179226.diff
View Options

diff --git a/lib/msun/aarch64/fenv.h b/lib/msun/aarch64/fenv.h
--- a/lib/msun/aarch64/fenv.h
+++ b/lib/msun/aarch64/fenv.h
@@ -96,6 +96,15 @@
int fedisableexcept(int);
int fegetexcept(void);
+/*
+ * C permits a standard library function to also be exposed as a function-like
+ * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++
+ * forbids it: <cfenv> imports these names into namespace std (using
+ * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the
+ * actual functions. Expose the inlining macros to C only; C++ uses the real
+ * extern functions (defined in the matching lib/msun/<arch>/fenv.c).
+ */
+#ifndef __cplusplus
#define feclearexcept(a) __feclearexcept_int(a)
#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a)
#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a)
@@ -110,6 +119,7 @@
#define feenableexcept(a) __feenableexcept_int(a)
#define fedisableexcept(a) __fedisableexcept_int(a)
#define fegetexcept() __fegetexcept_int()
+#endif /* !__cplusplus */
__fenv_static inline int
__feclearexcept_int(int __excepts)
diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h
--- a/lib/msun/arm/fenv.h
+++ b/lib/msun/arm/fenv.h
@@ -129,6 +129,15 @@
int fegetexcept(void);
#endif
+/*
+ * C permits a standard library function to also be exposed as a function-like
+ * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++
+ * forbids it: <cfenv> imports these names into namespace std (using
+ * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the
+ * actual functions. Expose the inlining macros to C only; C++ uses the real
+ * extern functions (defined in the matching lib/msun/<arch>/fenv.c).
+ */
+#ifndef __cplusplus
#define feclearexcept(a) __feclearexcept_int(a)
#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a)
#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a)
@@ -145,6 +154,7 @@
#define fedisableexcept(a) __fedisableexcept_int(a)
#define fegetexcept() __fegetexcept_int()
#endif
+#endif /* !__cplusplus */
__fenv_static inline int
__feclearexcept_int(int __excepts)
diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h
--- a/lib/msun/powerpc/fenv.h
+++ b/lib/msun/powerpc/fenv.h
@@ -123,6 +123,15 @@
int fesetenv(const fenv_t *);
int feupdateenv(const fenv_t *);
+/*
+ * C permits a standard library function to also be exposed as a function-like
+ * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++
+ * forbids it: <cfenv> imports these names into namespace std (using
+ * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the
+ * actual functions. Expose the inlining macros to C only; C++ uses the real
+ * extern functions (defined in the matching lib/msun/<arch>/fenv.c).
+ */
+#ifndef __cplusplus
#define feclearexcept(a) __feclearexcept_int(a)
#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a)
#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a)
@@ -134,6 +143,7 @@
#define feholdexcept(e) __feholdexcept_int(e)
#define fesetenv(e) __fesetenv_int(e)
#define feupdateenv(e) __feupdateenv_int(e)
+#endif /* !__cplusplus */
__fenv_static inline int
__feclearexcept_int(int __excepts)
@@ -266,8 +276,10 @@
int feenableexcept(int);
int fedisableexcept(int);
+#ifndef __cplusplus /* see the note above; C++ uses the real functions */
#define feenableexcept(a) __feenableexcept_int(a)
#define fedisableexcept(a) __fedisableexcept_int(a)
+#endif
__fenv_static inline int
__feenableexcept_int(int __mask)
diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h
--- a/lib/msun/riscv/fenv.h
+++ b/lib/msun/riscv/fenv.h
@@ -91,6 +91,15 @@
int fesetenv(const fenv_t *);
int feupdateenv(const fenv_t *);
+/*
+ * C permits a standard library function to also be exposed as a function-like
+ * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++
+ * forbids it: <cfenv> imports these names into namespace std (using
+ * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the
+ * actual functions. Expose the inlining macros to C only; C++ uses the real
+ * extern functions (defined in the matching lib/msun/<arch>/fenv.c).
+ */
+#ifndef __cplusplus
#define feclearexcept(a) __feclearexcept_int(a)
#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a)
#define fesetexceptflag(e, a) __fesetexceptflag_int(e, a)
@@ -102,6 +111,7 @@
#define feholdexcept(e) __feholdexcept_int(e)
#define fesetenv(e) __fesetenv_int(e)
#define feupdateenv(e) __feupdateenv_int(e)
+#endif /* !__cplusplus */
__fenv_static inline int
__feclearexcept_int(int __excepts)
@@ -224,8 +234,10 @@
int feenableexcept(int);
int fedisableexcept(int);
+#ifndef __cplusplus /* see the note above; C++ uses the real functions */
#define feenableexcept(a) __feenableexcept_int(a)
#define fedisableexcept(a) __fedisableexcept_int(a)
+#endif
__fenv_static inline int
__feenableexcept_int(int __mask __unused)
diff --git a/lib/msun/x86/fenv.h b/lib/msun/x86/fenv.h
--- a/lib/msun/x86/fenv.h
+++ b/lib/msun/x86/fenv.h
@@ -150,12 +150,22 @@
int fegetround(void);
int fesetenv(const fenv_t *);
+/*
+ * C permits a standard library function to also be exposed as a function-like
+ * macro (C23 7.1.4), and msun uses that here to inline the fast path. C++
+ * forbids it: <cfenv> imports these names into namespace std (using
+ * ::feclearexcept; etc.), so std::feclearexcept() and friends must denote the
+ * actual functions. Expose the inlining macros to C only; C++ uses the real
+ * extern functions (defined in the matching lib/msun/<arch>/fenv.c).
+ */
+#ifndef __cplusplus
#define feclearexcept(a) __feclearexcept_int(a)
#define fegetexceptflag(e, a) __fegetexceptflag_int(e, a)
#define fetestexcept(a) __fetestexcept_int(a)
#define fesetround(a) __fesetround_int(a)
#define fegetround() __fegetround_int()
#define fesetenv(a) __fesetenv_int(a)
+#endif /* !__cplusplus */
#ifdef __i386__

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 24, 2:02 AM (3 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35424644
Default Alt Text
D57450.id179226.diff (5 KB)

Event Timeline