merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 4dd875ee6fc85b37ad6039d6ef3fa48aab7c6821..c22539a1cf55bae1e046a003d38055342959c1e6 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,17 @@
+2015-03-02  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+       PR target/65261
+       * ansidecl.h (ATTRIBUTE_NO_SANITIZE_UNDEFINED): New macro.
+
+2015-02-19  Pedro Alves  <palves@redhat.com>
+
+       * floatformat.h [__cplusplus]: Wrap in extern "C".
+
+2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2.h (enum dwarf_source_language): Add DW_LANG_Fortran03
+       and DW_LANG_Fortran08.
+
 2015-01-15  Thomas Schwinge  <thomas@codesourcery.com>
            Julian Brown  <julian@codesourcery.com>
            James Norris  <jnorris@codesourcery.com>

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 0fb23bba792dbb30d852723b9ac9a5d337e3aedc..04d75c33f747220ddf9e4cfabb29f762bea3b749 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -276,6 +276,15 @@ So instead we use the macro below and test it against specific values.  */
 # endif /* GNUC >= 4.3 */
 #endif /* ATTRIBUTE_HOT */
 
+/* Attribute 'no_sanitize_undefined' was valid as of gcc 4.9.  */
+#ifndef ATTRIBUTE_NO_SANITIZE_UNDEFINED
+# if (GCC_VERSION >= 4009)
+#  define ATTRIBUTE_NO_SANITIZE_UNDEFINED __attribute__ ((no_sanitize_undefined))
+# else
+#  define ATTRIBUTE_NO_SANITIZE_UNDEFINED
+# endif /* GNUC >= 4.9 */
+#endif /* ATTRIBUTE_NO_SANITIZE_UNDEFINED */
+
 /* We use __extension__ in some places to suppress -pedantic warnings
    about GCC extensions.  This feature didn't work properly before
    gcc 2.8.  */

diff --git a/include/dwarf2.h b/include/dwarf2.h
index ca440dd42b535ad9665afdc73a57f8da7be4e690..e05955cad4695f944ff0326f753276279f9e04c8 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -312,6 +312,8 @@ enum dwarf_source_language
     DW_LANG_C_plus_plus_11 = 0x001a, /* dwarf5.20141029.pdf DRAFT */
     DW_LANG_C11 = 0x001d,
     DW_LANG_C_plus_plus_14 = 0x0021,
+    DW_LANG_Fortran03 = 0x0022,
+    DW_LANG_Fortran08 = 0x0023,
 
     DW_LANG_lo_user = 0x8000,  /* Implementation-defined range start.  */
     DW_LANG_hi_user = 0xffff,  /* Implementation-defined range start.  */

diff --git a/include/floatformat.h b/include/floatformat.h
index 04db61a2659f02bc1da5a5511a6a52e79790c4ec..e15e07c2249b9c852f89dedc1bd7bc4d8e142fc3 100644 (file)
--- a/include/floatformat.h
+++ b/include/floatformat.h
@@ -23,6 +23,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include "ansidecl.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* A floatformat consists of a sign bit, an exponent and a mantissa.  Once the
    bytes are concatenated according to the byteorder flag, then each of those
    fields is contiguous.  We number the bits with 0 being the most significant
@@ -149,4 +153,8 @@ floatformat_from_double (const struct floatformat *, const double *, void *);
 extern int
 floatformat_is_valid (const struct floatformat *fmt, const void *from);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* defined (FLOATFORMAT_H) */