diff options
| author | Martin Liska <mliska@suse.cz> | 2022-09-20 13:53:30 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-09-20 13:53:30 +0200 |
| commit | 6df29b782e87c6c800be0425023d8438fdc67b92 (patch) | |
| tree | 48eebe497e384d66a7f5cf861b4b1b963785a2cd /gcc/ginclude | |
| parent | fdb97cd0b7d15efa39ba79dca44be93debb0ef12 (diff) | |
| parent | 63e3cc294d835b43701eeef9410d1b8fc8922869 (diff) | |
| download | gcc-6df29b782e87c6c800be0425023d8438fdc67b92.zip gcc-6df29b782e87c6c800be0425023d8438fdc67b92.tar.gz gcc-6df29b782e87c6c800be0425023d8438fdc67b92.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/ginclude')
| -rw-r--r-- | gcc/ginclude/float.h | 4 | ||||
| -rw-r--r-- | gcc/ginclude/stdatomic.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h index 9d368c4..afe4a71 100644 --- a/gcc/ginclude/float.h +++ b/gcc/ginclude/float.h @@ -257,9 +257,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define DBL_IS_IEC_60559 __DBL_IS_IEC_60559__ #define LDBL_IS_IEC_60559 __LDBL_IS_IEC_60559__ -/* Infinity in type float, or overflow if infinity not supported. */ +/* Infinity in type float; not defined if infinity not supported. */ +#if __FLT_HAS_INFINITY__ #undef INFINITY #define INFINITY (__builtin_inff ()) +#endif /* Quiet NaN, if supported for float. */ #if __FLT_HAS_QUIET_NAN__ diff --git a/gcc/ginclude/stdatomic.h b/gcc/ginclude/stdatomic.h index 9f2475b..a56ba5d 100644 --- a/gcc/ginclude/stdatomic.h +++ b/gcc/ginclude/stdatomic.h @@ -79,7 +79,9 @@ typedef _Atomic __INTMAX_TYPE__ atomic_intmax_t; typedef _Atomic __UINTMAX_TYPE__ atomic_uintmax_t; +#if !(defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L) #define ATOMIC_VAR_INIT(VALUE) (VALUE) +#endif /* Initialize an atomic object pointed to by PTR with VAL. */ #define atomic_init(PTR, VAL) \ |