diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2014-09-05 05:20:52 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2014-09-05 05:20:52 +0000 |
| commit | 7aa83a16bce6adca4c7e3af643705dc4acb031a0 (patch) | |
| tree | bb2516741beb44ab63449dc47bbeb24dad89b95d /sys/sys | |
| parent | a2deaef55dd7116f944b8505e29bcac50be1e4d2 (diff) | |
| download | src-7aa83a16bce6adca4c7e3af643705dc4acb031a0.tar.gz src-7aa83a16bce6adca4c7e3af643705dc4acb031a0.zip | |
Partially revert r271012.
Incredibly weird: GCC 4.7/4.9 do support the _Noreturn and _Thread_local
keywords, but not during bootstrapping. GCC is by far the weirdest
compiler that I've ever used.
Reported by: andreast@
Notes
Notes:
svn path=/head/; revision=271154
Diffstat (limited to 'sys/sys')
| -rw-r--r-- | sys/sys/cdefs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 3d1aba46b037..da92817a7623 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -280,13 +280,11 @@ #define _Atomic(T) struct { T volatile __val; } #endif -#if !__GNUC_PREREQ__(4, 7) #if defined(__cplusplus) && __cplusplus >= 201103L #define _Noreturn [[noreturn]] #else #define _Noreturn __dead2 #endif -#endif #if !__has_extension(c_static_assert) && !__GNUC_PREREQ__(4, 7) #if (defined(__cplusplus) && __cplusplus >= 201103L) || \ @@ -301,7 +299,7 @@ #endif #endif -#if !__has_extension(c_thread_local) && !__GNUC_PREREQ__(4, 9) +#if !__has_extension(c_thread_local) /* * XXX: Some compilers (Clang 3.3, GCC 4.7) falsely announce C++11 mode * without actually supporting the thread_local keyword. Don't check for |