* gold.h (FUNCTION_NAME): Define.

	(gold_unreachable): Use FUNCTION_NAME.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 14709bfe23e5cbd6a5ed0e3c81085a9568621690..687693a60712e73b6aeac2a8ab86c5ffd5a5cff2 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-14  Ian Lance Taylor  <iant@google.com>
+
+       * gold.h (FUNCTION_NAME): Define.
+       (gold_unreachable): Use FUNCTION_NAME.
+
 2009-08-12  Sriraman Tallam  <tmsriram@google.com>
 
        * icf.cc (Icf::find_identical_sections): Issue a warning when a

diff --git a/gold/gold.h b/gold/gold.h
index 1319699ae76d2856fe06cb168108412cab1e757d..3f514cdd1d42ca2a30df7c3239351120f21ff0d9 100644 (file)
--- a/gold/gold.h
+++ b/gold/gold.h
@@ -253,11 +253,22 @@ gold_undefined_symbol_at_location(const Symbol*,
 extern void
 gold_nomem() ATTRIBUTE_NORETURN;
 
+// In versions of gcc before 4.3, using __FUNCTION__ in a template
+// function can cause gcc to get confused about whether or not the
+// function can return.  See http://gcc.gnu.org/PR30988.  Use a macro
+// to avoid the problem.  This can be removed when we no longer need
+// to care about gcc versions before 4.3.
+#if defined(__GNUC__) && GCC_VERSION < 4003
+#define FUNCTION_NAME static_cast<const char*>(__FUNCTION__)
+#else 
+#define FUNCTION_NAME __FUNCTION__
+#endif
+
 // This macro and function are used in cases which can not arise if
 // the code is written correctly.
 
 #define gold_unreachable() \
-  (gold::do_gold_unreachable(__FILE__, __LINE__, __FUNCTION__))
+  (gold::do_gold_unreachable(__FILE__, __LINE__, FUNCTION_NAME))
 
 extern void do_gold_unreachable(const char*, int, const char*)
   ATTRIBUTE_NORETURN;