merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index e5b7dba3245d7c6e2953b9d1fe10bf2fe6c29279..75c4753b77d755d142f1b76dea3087c786a5785e 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-06  Jan Hubicka  <jh@suse.cz>
+
+       * ansidecl.h (ATTRIBUTE_COLD, ATTRIBUTE_HOT): New.
+
 2007-02-21  Nick Clifton  <nickc@redhat.com>
 
        * bfdlink.h (struct bfd_link_callbacks): Add

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 16adc47a1bfa6f6bbff44e8c9f14eea18f7052df..c19955a98a677f66dc9bf5e54291ac0f3aa3efff 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -367,6 +367,22 @@ So instead we use the macro below and test it against specific values.  */
 # define ATTRIBUTE_PACKED __attribute__ ((packed))
 #endif
 
+/* Attribute `hot' and `cold' was valid as of gcc 4.3.  */
+#ifndef ATTRIBUTE_COLD
+# if (GCC_VERSION >= 4003)
+#  define ATTRIBUTE_COLD __attribute__ ((__cold__))
+# else
+#  define ATTRIBUTE_COLD
+# endif /* GNUC >= 4.3 */
+#endif /* ATTRIBUTE_COLD */
+#ifndef ATTRIBUTE_HOT
+# if (GCC_VERSION >= 4003)
+#  define ATTRIBUTE_HOT __attribute__ ((__hot__))
+# else
+#  define ATTRIBUTE_HOT
+# endif /* GNUC >= 4.3 */
+#endif /* ATTRIBUTE_HOT */
+
 /* We use __extension__ in some places to suppress -pedantic warnings
    about GCC extensions.  This feature didn't work properly before
    gcc 2.8.  */