From: David Daney Date: Fri, 12 Jun 2009 00:04:11 +0000 (+0000) Subject: system.h (gcc_assert, [...]): Revert accidental commit in r148403. X-Git-Tag: releases/gcc-4.5.0~5253 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4de8ce3b5289d7a0032c677f6d98936e762ab40b;p=thirdparty%2Fgcc.git system.h (gcc_assert, [...]): Revert accidental commit in r148403. 2009-06-11 David Daney * system.h (gcc_assert, gcc_unreachable): Revert accidental commit in r148403. From-SVN: r148404 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a19b5be40d3..616a3644ba1f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-06-11 David Daney + + * system.h (gcc_assert, gcc_unreachable): Revert accidental commit + in r148403. + 2009-06-11 David Daney PR c/39252 diff --git a/gcc/system.h b/gcc/system.h index 3bb61ce84908..51d9c995c3cf 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,