merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index e90130f66ed006066ae569a971478a5382c4e468..17a62bade2aaf5fd440891b85b3ccfce40edffd0 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-20  Alan Modra  <amodra@gmail.com>
+
+       * floatformat.h (floatformat_ibm_long_double): Delete.
+       (floatformat_ibm_long_double_big): Declare.
+       (floatformat_ibm_long_double_little): Declare.
+
+2013-08-19  Dehao Chen  <dehao@google.com>
+
+       * dwarf2.def (DW_AT_GNU_discriminator): New attribute.
+
 2013-08-02  Caroline Tice  <cmtice@google.com>
 
        * vtv-change-permission.h: New file.

diff --git a/include/dwarf2.def b/include/dwarf2.def
index 7fe2df126c5faaae1f4c8811b74fec8f038bec8e..71a37b30c9f87b429bab08a4a420caa9a6385503 100644 (file)
--- a/include/dwarf2.def
+++ b/include/dwarf2.def
@@ -390,6 +390,9 @@ DW_AT (DW_AT_GNU_ranges_base, 0x2132)
 DW_AT (DW_AT_GNU_addr_base, 0x2133)
 DW_AT (DW_AT_GNU_pubnames, 0x2134)
 DW_AT (DW_AT_GNU_pubtypes, 0x2135)
+/* Attribute for discriminator.
+   See http://gcc.gnu.org/wiki/Discriminator  */
+DW_AT (DW_AT_GNU_discriminator, 0x2136)
 /* VMS extensions.  */
 DW_AT (DW_AT_VMS_rtnbeg_pd_address, 0x2201)
 /* GNAT extensions.  */

diff --git a/include/floatformat.h b/include/floatformat.h
index b5951644ea5108b93a5a935d33cd4ba3bba1cec4..04db61a2659f02bc1da5a5511a6a52e79790c4ec 100644 (file)
--- a/include/floatformat.h
+++ b/include/floatformat.h
@@ -128,7 +128,8 @@ extern const struct floatformat floatformat_ia64_spill_little;
 extern const struct floatformat floatformat_ia64_quad_big;
 extern const struct floatformat floatformat_ia64_quad_little;
 /* IBM long double (double+double).  */
-extern const struct floatformat floatformat_ibm_long_double;
+extern const struct floatformat floatformat_ibm_long_double_big;
+extern const struct floatformat floatformat_ibm_long_double_little;
 
 /* Convert from FMT to a double.
    FROM is the address of the extended float.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 73b5c2995753ba25b05227d754781992a7697bf4..e4ce0b9a637639924282501c92667ffa9ee2966b 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-20  Alan Modra  <amodra@gmail.com>
+
+       * floatformat.c (floatformat_ibm_long_double): Rename to..
+       (floatformat_ibm_long_double_big): ..this.
+       (floatformat_ibm_long_double_little): New.
+
 2013-07-09  Tristan Gingold  <gingold@adacore.com>
 
        * makefile.vms (OBJS): Add dwarfnames.obj

diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c
index c58ab01bce2d79811778064201c27a54eeb887c9..789fa05777dd3dc36b799e17cad1b91a228062ef 100644 (file)
--- a/libiberty/floatformat.c
+++ b/libiberty/floatformat.c
@@ -371,14 +371,23 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt,
     }
 }
 
-const struct floatformat floatformat_ibm_long_double =
+const struct floatformat floatformat_ibm_long_double_big =
 {
   floatformat_big, 128, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
-  "floatformat_ibm_long_double",
+  "floatformat_ibm_long_double_big",
   floatformat_ibm_long_double_is_valid,
   &floatformat_ieee_double_big
 };
+
+const struct floatformat floatformat_ibm_long_double_little =
+{
+  floatformat_little, 128, 0, 1, 11, 1023, 2047, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_ibm_long_double_little",
+  floatformat_ibm_long_double_is_valid,
+  &floatformat_ieee_double_little
+};
 \f
 
 #ifndef min