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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a19b5be40d373a3e1c4f6e03ceb4eaef2720019..616a3644ba1f1ed9058961db363462226bbec157 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/system.h b/gcc/system.h
index 3bb61ce8490844a4f9f07975e0c4179da19910c4..51d9c995c3cf86783d6d22ccdc58264e36e6e678 100644 (file)
--- 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,