diff options
| author | David Daney <ddaney@caviumnetworks.com> | 2009-06-12 00:04:11 +0000 |
|---|---|---|
| committer | David Daney <daney@gcc.gnu.org> | 2009-06-12 00:04:11 +0000 |
| commit | 4de8ce3b5289d7a0032c677f6d98936e762ab40b (patch) | |
| tree | 67abdc573d603f4a692a953e4990ab6169717192 /gcc | |
| parent | 468059bcbb8efdb31fd90369dc2ed122126413fe (diff) | |
| download | gcc-4de8ce3b5289d7a0032c677f6d98936e762ab40b.zip gcc-4de8ce3b5289d7a0032c677f6d98936e762ab40b.tar.gz gcc-4de8ce3b5289d7a0032c677f6d98936e762ab40b.tar.bz2 | |
system.h (gcc_assert, [...]): Revert accidental commit in r148403.
2009-06-11 David Daney <ddaney@caviumnetworks.com>
* system.h (gcc_assert, gcc_unreachable): Revert accidental commit
in r148403.
From-SVN: r148404
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/system.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a19b5b..616a364 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2009-06-11 David Daney <ddaney@caviumnetworks.com> + * system.h (gcc_assert, gcc_unreachable): Revert accidental commit + in r148403. + +2009-06-11 David Daney <ddaney@caviumnetworks.com> + PR c/39252 * doc/extend.texi ( __builtin_unreachable): Document new builtin. * builtins.c (expand_builtin_unreachable): New function. diff --git a/gcc/system.h b/gcc/system.h index 3bb61ce..51d9c99 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -576,20 +576,14 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN; #if ENABLE_ASSERT_CHECKING #define gcc_assert(EXPR) \ ((void)(!(EXPR) ? fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0 : 0)) -#elif (__GNUC__ == 4) && (__GNUC_MINOR__) && 0 -#define gcc_assert(EXPR) do { if (EXPR) __builtin_unreachable (); } while (0) #else /* Include EXPR, so that unused variable warnings do not occur. */ #define gcc_assert(EXPR) ((void)(0 && (EXPR))) #endif -#if !ENABLE_ASSERT_CHECKING && (__GNUC__ == 4) && (__GNUC_MINOR__) && 0 -#define gcc_unreachable() __builtin_unreachable () -#else /* Use gcc_unreachable() to mark unreachable locations (like an unreachable default case of a switch. Do not use gcc_assert(0). */ #define gcc_unreachable() (fancy_abort (__FILE__, __LINE__, __FUNCTION__)) -#endif /* Provide a fake boolean type. We make no attempt to use the C99 _Bool, as it may not be available in the bootstrap compiler, |