From 2079956a87de079b4a04ac938141e437e60bbff8 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 12 Nov 2014 13:33:45 +0000
Subject: [PATCH] Predefine __NO_MATH_ERRNO__ for -fno-math-errno.
This patch adds a predefined macro __NO_MATH_ERRNO__ for when
-fno-math-errno is passed or implied. This allows math.h to provide a
more accurate definition of the C99 math_errhandling macro that takes
this option into account, and allows for choice of libm functions to
be optimized at compile time based on this option.
(There may be a case for such interfaces for -fno-rounding-math
(default) and -fno-trapping-math as well, but as C99 standard pragmas
would allow those to vary on a per-block basis, predefined macros
would be problematic as the interface; you can't select a
-fno-trapping-math or -fno-rounding-math version of a function in a
standard header if a conforming program could then use "#pragma STDC
FENV_ACCESS ON" to require a -ftrapping-math -frounding-math version
in a particular block. So built-in functions might be a better way of
providing access to information about those options.)
Bootstrapped with no regressions on x86_64-unknown-linux-gnu. OK to
commit?
* cppbuiltin.c (define_builtin_macros_for_compilation_flags):
Define __NO_MATH_ERRNO__ if -fno-math-errno.
* doc/cpp.texi (__NO_MATH_ERRNO__): Document predefined macro.
c-family:
* c-cppbuiltin.c (c_cpp_builtins_optimize_pragma): Define and
undefine __NO_MATH_ERRNO__ based on changes to -fmath-errno state.
testsuite:
* gcc.dg/no-math-errno-1.c, gcc.dg/no-math-errno-2.c,
gcc.dg/no-math-errno-3.c, gcc.dg/no-math-errno-4.c: New tests.
From-SVN: r217420
---
gcc/ChangeLog | 6 ++++++
gcc/c-family/ChangeLog | 5 +++++
gcc/c-family/c-cppbuiltin.c | 5 +++++
gcc/cppbuiltin.c | 2 ++
gcc/doc/cpp.texi | 4 ++++
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gcc.dg/no-math-errno-1.c | 7 +++++++
gcc/testsuite/gcc.dg/no-math-errno-2.c | 7 +++++++
gcc/testsuite/gcc.dg/no-math-errno-3.c | 7 +++++++
gcc/testsuite/gcc.dg/no-math-errno-4.c | 17 +++++++++++++++++
10 files changed, 65 insertions(+)
create mode 100644 gcc/testsuite/gcc.dg/no-math-errno-1.c
create mode 100644 gcc/testsuite/gcc.dg/no-math-errno-2.c
create mode 100644 gcc/testsuite/gcc.dg/no-math-errno-3.c
create mode 100644 gcc/testsuite/gcc.dg/no-math-errno-4.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b422f484548..8d52622b1bf7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-12 Joseph Myers <joseph@codesourcery.com>
+
+ * cppbuiltin.c (define_builtin_macros_for_compilation_flags):
+ Define __NO_MATH_ERRNO__ if -fno-math-errno.
+ * doc/cpp.texi (__NO_MATH_ERRNO__): Document predefined macro.
+
2014-11-12 Richard Biener <rguenther@suse.de>
* genmatch.c (::gen_transform): Add capture_info and
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 7feda0f185d2..4eb90fc1b117 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-12 Joseph Myers <joseph@codesourcery.com>
+
+ * c-cppbuiltin.c (c_cpp_builtins_optimize_pragma): Define and
+ undefine __NO_MATH_ERRNO__ based on changes to -fmath-errno state.
+
2014-11-12 Jakub Jelinek <jakub@redhat.com>
PR c/59708
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index a4ed5c62ba72..c571d1b2e1ea 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -549,6 +549,11 @@ c_cpp_builtins_optimize_pragma (cpp_reader *pfile, tree prev_tree,
else if (prev->x_flag_signaling_nans && !cur->x_flag_signaling_nans)
cpp_undef (pfile, "__SUPPORT_SNAN__");
+ if (!prev->x_flag_errno_math && cur->x_flag_errno_math)
+ cpp_undef (pfile, "__NO_MATH_ERRNO__");
+ else if (prev->x_flag_errno_math && !cur->x_flag_errno_math)
+ cpp_define (pfile, "__NO_MATH_ERRNO__");
+
if (!prev->x_flag_finite_math_only && cur->x_flag_finite_math_only)
{
cpp_undef (pfile, "__FINITE_MATH_ONLY__");
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index 3fc2f8adb834..474f72407274 100644
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.c
@@ -102,6 +102,8 @@ define_builtin_macros_for_compilation_flags (cpp_reader *pfile)
cpp_define (pfile, "__FAST_MATH__");
if (flag_signaling_nans)
cpp_define (pfile, "__SUPPORT_SNAN__");
+ if (!flag_errno_math)
+ cpp_define (pfile, "__NO_MATH_ERRNO__");
cpp_define_formatted (pfile, "__FINITE_MATH_ONLY__=%d",
flag_finite_math_only);
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index f32aac70b6e8..df04d0baf467 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -2421,6 +2421,10 @@ Annex G requirements (for example, because @option{-fcx-limited-range}
was used). If 1 or more, it indicates that it is intended to support
those requirements; this does not mean that all relevant language
features are supported by GCC.
+
+@item __NO_MATH_ERRNO__
+This macro is defined if @option{-fno-math-errno} is used, or enabled
+by another option such as @option{-ffast-math} or by default.
@end table
@node System-specific Predefined Macros
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c72e75f781c2..0b5b09469822 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-12 Joseph Myers <joseph@codesourcery.com>
+
+ * gcc.dg/no-math-errno-1.c, gcc.dg/no-math-errno-2.c,
+ gcc.dg/no-math-errno-3.c, gcc.dg/no-math-errno-4.c: New tests.
+
2014-11-12 H.J. Lu <hongjiu.lu@intel.com>
PR testsuite/63830
diff --git a/gcc/testsuite/gcc.dg/no-math-errno-1.c b/gcc/testsuite/gcc.dg/no-math-errno-1.c
new file mode 100644
index 000000000000..2659f59c9ca2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/no-math-errno-1.c
@@ -0,0 +1,7 @@
+/* Test __NO_MATH_ERRNO__ is defined with -fno-math-errno. */
+/* { dg-do compile } */
+/* { dg-options "-fno-math-errno" } */
+
+#ifndef __NO_MATH_ERRNO__
+#error "__NO_MATH_ERRNO__ not defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/no-math-errno-2.c b/gcc/testsuite/gcc.dg/no-math-errno-2.c
new file mode 100644
index 000000000000..f44a997cad37
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/no-math-errno-2.c
@@ -0,0 +1,7 @@
+/* Test __NO_MATH_ERRNO__ is defined with -ffast-math. */
+/* { dg-do compile } */
+/* { dg-options "-ffast-math" } */
+
+#ifndef __NO_MATH_ERRNO__
+#error "__NO_MATH_ERRNO__ not defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/no-math-errno-3.c b/gcc/testsuite/gcc.dg/no-math-errno-3.c
new file mode 100644
index 000000000000..e19e94f2be59
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/no-math-errno-3.c
@@ -0,0 +1,7 @@
+/* Test __NO_MATH_ERRNO__ is not defined with -fmath-errno. */
+/* { dg-do compile } */
+/* { dg-options "-fmath-errno" } */
+
+#ifdef __NO_MATH_ERRNO__
+#error "__NO_MATH_ERRNO__ defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/no-math-errno-4.c b/gcc/testsuite/gcc.dg/no-math-errno-4.c
new file mode 100644
index 000000000000..c6daa128ffdd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/no-math-errno-4.c
@@ -0,0 +1,17 @@
+/* Test __NO_MATH_ERRNO__ is defined and undefined by pragmas. */
+/* { dg-do compile } */
+/* { dg-options "-fmath-errno" } */
+
+#ifdef __NO_MATH_ERRNO__
+#error "__NO_MATH_ERRNO__ defined"
+#endif
+
+#pragma GCC optimize "-fno-math-errno"
+#ifndef __NO_MATH_ERRNO__
+#error "__NO_MATH_ERRNO__ not defined"
+#endif
+
+#pragma GCC optimize "-fmath-errno"
+#ifdef __NO_MATH_ERRNO__
+#error "__NO_MATH_ERRNO__ defined"
+#endif
--
GitLab