merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index e6af921b5c6c7ca1364569ef0ed7a43f0137f59f..c3a9d8a9445efb8681c5754bd4151aec1f21eabe 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-21  Paolo Bonzini  <bonzini@gnu.org>
+
+       * ansidecl.h (ATTRIBUTE_PURE): New.
+
 2004-07-13  Bernardo Innocenti  <bernie@develer.com>
 
        * libiberty.h (XNEW, XCNEW, XNEWVEC, XCNEWVEC, XOBNEW): Move here from

diff --git a/include/ansidecl.h b/include/ansidecl.h
index d2c87768ce2ef6336c7f240b055a4b5e145c4976..4b3eae9d8870c39bbdac54e1d371a98e39461865 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -277,6 +277,15 @@ So instead we use the macro below and test it against specific values.  */
 # endif /* GNUC >= 3.3 */
 #endif /* ATTRIBUTE_NONNULL */
 
+/* Attribute `pure' was valid as of gcc 3.0.  */
+#ifndef ATTRIBUTE_PURE
+# if (GCC_VERSION >= 3000)
+#  define ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define ATTRIBUTE_PURE
+# endif /* GNUC >= 3.0 */
+#endif /* ATTRIBUTE_PURE */
+
 /* Use ATTRIBUTE_PRINTF when the format specifier must not be NULL.
    This was the case for the `printf' format attribute by itself
    before GCC 3.3, but as of 3.3 we need to add the `nonnull'