From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 10 Jun 2009 01:48:14 +0000 (+0000)
Subject: * ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Define for C++.
X-Git-Tag: releases/gcc-4.5.0~5285
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=780ca5bf715142256f55d6bda4a282c9a3529d33;p=thirdparty%2Fgcc.git

* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Define for C++.

From-SVN: r148333
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 4693ff9a5984..b680b436b003 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,4 +1,8 @@
-2009-06-02  Ian Lance Taylor  <iant@google.com>
+2009-06-09  Ian Lance Taylor  <ian@airs.com>
+
+	* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Define for C++.
+
+2009-06-03  Ian Lance Taylor  <iant@google.com>
 
 	* ansidecl.h (EXPORTED_CONST): Define.
 
diff --git a/include/ansidecl.h b/include/ansidecl.h
index f9864cd38642..86b094474825 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__))