From: dj <dj>
Date: Tue, 16 Jun 2009 13:21:26 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: cgen-snapshot-20091101~2107
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7fcb28d057cc0318733aa16aa78839079ca4b3ed;p=pf3gnuchains%2Fpf3gnuchains4x.git

merge from gcc
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 82b1045918..6742d24c95 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-09  Ian Lance Taylor  <ian@airs.com>
+
+	* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Define for C++.
+
 2009-06-15  Nick Clifton  <nickc@redhat.com>
 
 	* dis-asm.h (struct disassemble_info): New value for the flags
diff --git a/include/ansidecl.h b/include/ansidecl.h
index f9864cd386..86b0944748 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -261,14 +261,23 @@ So instead we use the macro below and test it against specific values.  */
 # endif /* GNUC >= 2.96 */
 #endif /* ATTRIBUTE_MALLOC */
 
-/* Attributes on labels were valid as of gcc 2.93. */
+/* Attributes on labels were valid as of gcc 2.93 and g++ 4.5.  For
+   g++ an attribute on a label must be followed by a semicolon.  */
 #ifndef ATTRIBUTE_UNUSED_LABEL
-# if (!defined (__cplusplus) && GCC_VERSION >= 2093)
-#  define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
+# ifndef __cplusplus
+#  if GCC_VERSION >= 2093
+#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
+#  else
+#   define ATTRIBUTE_UNUSED_LABEL
+#  endif
 # else
-#  define ATTRIBUTE_UNUSED_LABEL
-# endif /* !__cplusplus && GNUC >= 2.93 */
-#endif /* ATTRIBUTE_UNUSED_LABEL */
+#  if GCC_VERSION >= 4005
+#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED ;
+#  else
+#   define ATTRIBUTE_UNUSED_LABEL
+#  endif
+# endif
+#endif
 
 #ifndef ATTRIBUTE_UNUSED
 #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))