Fix elf64-ppc.c electric fence warning

[deliverable/binutils-gdb.git] / gdb / common / gdb_assert.h

diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index de1a1c98702c23c465a25463bd05574806f099aa..ed2d7a8cc1a28c081209596979cced5e54fee725 100644 (file)
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/gdb_assert.h
@@ -1,6 +1,5 @@
 /* GDB-friendly replacement for <assert.h>.
-   Copyright (C) 2000, 2001, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,7 +22,7 @@
 /* A static assertion.  This will cause a compile-time error if EXPR,
    which must be a compile-time constant, is false.  */
 
-#define static_assert(expr) \
+#define gdb_static_assert(expr) \
   extern int never_defined_just_used_for_checking[(expr) ? 1 : -1]
 
 /* PRAGMATICS: "gdb_assert.h":gdb_assert() is a lower case (rather
@@ -33,24 +32,11 @@
 
 #define gdb_assert(expr)                                                      \
   ((void) ((expr) ? 0 :                                                       \
-          (gdb_assert_fail (#expr, __FILE__, __LINE__, ASSERT_FUNCTION), 0)))
-
-/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
-   which contains the name of the function currently being defined.
-   This is broken in G++ before version 2.6.
-   C9x has a similar variable called __func__, but prefer the GCC one since
-   it demangles C++ function names.  */
-#if (GCC_VERSION >= 2004)
-#define ASSERT_FUNCTION                __PRETTY_FUNCTION__
-#else
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#define ASSERT_FUNCTION                __func__
-#endif
-#endif
+          (gdb_assert_fail (#expr, __FILE__, __LINE__, FUNCTION_NAME), 0)))
 
 /* This prints an "Assertion failed" message, asking the user if they
    want to continue, dump core, or just exit.  */
-#if defined (ASSERT_FUNCTION)
+#if defined (FUNCTION_NAME)
 #define gdb_assert_fail(assertion, file, line, function)                      \
   internal_error (file, line, _("%s: Assertion `%s' failed."),                \
                  function, assertion)
@@ -63,9 +49,9 @@
 /* The canonical form of gdb_assert (0).
    MESSAGE is a string to include in the error message.  */
 
-#if defined (ASSERT_FUNCTION)
+#if defined (FUNCTION_NAME)
 #define gdb_assert_not_reached(message) \
-  internal_error (__FILE__, __LINE__, "%s: %s", ASSERT_FUNCTION, _(message))
+  internal_error (__FILE__, __LINE__, "%s: %s", FUNCTION_NAME, _(message))
 #else
 #define gdb_assert_not_reached(message) \
   internal_error (__FILE__, __LINE__, _(message))