diff options
| author | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2017-08-14 17:51:51 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2017-08-18 12:19:28 -0300 |
| commit | 6913ad65e00bb32417ad39c41d292b976171e27e (patch) | |
| tree | cba357292847805be3e6220523fbaa7ac50672ba | |
| parent | 47a67213a9f51c5f8816d240500b10db605d8b77 (diff) | |
| download | glibc-6913ad65e00bb32417ad39c41d292b976171e27e.tar.gz glibc-6913ad65e00bb32417ad39c41d292b976171e27e.tar.xz glibc-6913ad65e00bb32417ad39c41d292b976171e27e.zip | |
Do not use generic selection in C++ mode
The logic to protect the use of generic selection (_Generic) does not check for C or C++ mode, however, generic selection is a C-only feature. Tested for powerpc64le. * misc/sys/cdefs.h (__HAVE_GENERIC_SELECTION): Define to 0, if in C++ mode.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | misc/sys/cdefs.h | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 2050a1cacd..7ba3bafcfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-08-18 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> + * misc/sys/cdefs.h (__HAVE_GENERIC_SELECTION): Define to 0, if + in C++ mode. + +2017-08-18 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> + [BZ #21930] * math/math.h (isinf): Check if in C or C++ mode before using __builtin_types_compatible_p, since this is a C mode feature. diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index b3e7f3be96..cfd39d5302 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -463,17 +463,18 @@ # define __glibc_macro_warning(msg) #endif -/* Support for generic selection (ISO C11) is available in GCC since - version 4.9. Previous versions do not provide generic selection, - even though they might set __STDC_VERSION__ to 201112L, when in - -std=c11 mode. Thus, we must check for !defined __GNUC__ when - testing __STDC_VERSION__ for generic selection support. +/* Generic selection (ISO C11) is a C-only feature, available in GCC + since version 4.9. Previous versions do not provide generic + selection, even though they might set __STDC_VERSION__ to 201112L, + when in -std=c11 mode. Thus, we must check for !defined __GNUC__ + when testing __STDC_VERSION__ for generic selection support. On the other hand, Clang also defines __GNUC__, so a clang-specific check is required to enable the use of generic selection. */ -#if __GNUC_PREREQ (4, 9) \ - || __glibc_clang_has_extension (c_generic_selections) \ - || (!defined __GNUC__ && defined __STDC_VERSION__ \ - && __STDC_VERSION__ >= 201112L) +#if !defined __cplusplus \ + && (__GNUC_PREREQ (4, 9) \ + || __glibc_clang_has_extension (c_generic_selections) \ + || (!defined __GNUC__ && defined __STDC_VERSION__ \ + && __STDC_VERSION__ >= 201112L)) # define __HAVE_GENERIC_SELECTION 1 #else # define __HAVE_GENERIC_SELECTION 0 |