merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index dc55ff2..e2cbeb4 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-12  Ben Elliston  <bje@au.ibm.com>
+
+       * floatformat.c (floatformat_to_double): Add a comment about a
+       potential source of warnings when compiling this file.
+
+2005-07-12  Ben Elliston  <bje@au.ibm.com>
+
+       * pexecute.c (pexecute): Cast string litrals to char *.
+       * regex.c (re_comp): Cast a call to gettext() to char *.
+
 2005-07-07  Kelley Cook  <kcook@gcc.gnu.org>
 
        * config.table: Delete file.  Move former contents into ...

diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c
index 41000f4..e466f53 100644 (file)
--- a/libiberty/floatformat.c
+++ b/libiberty/floatformat.c
@@ -306,6 +306,13 @@ floatformat_to_double (const struct floatformat *fmt,
          mant_bits_left -= mant_bits;
        }
 
+      /* On certain systems (such as GNU/Linux), the use of the
+        INFINITY macro below may generate a warning that can not be
+        silenced due to a bug in GCC (PR preprocessor/11931).  The
+        preprocessor fails to recognise the __extension__ keyword in
+        conjunction with the GNU/C99 extension for hexadecimal
+        floating point constants and will issue a warning when
+        compiling with -pedantic.  */
       if (nan)
        dto = NAN;
       else

diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c
index 60a280b..cce6e30 100644 (file)
--- a/libiberty/pexecute.c
+++ b/libiberty/pexecute.c
@@ -47,7 +47,7 @@ pexecute (const char *program, char * const *argv, const char *pname,
     {
       if (pex != NULL)
        {
-         *errmsg_fmt = "pexecute already in progress";
+         *errmsg_fmt = (char *) "pexecute already in progress";
          *errmsg_arg = NULL;
          return -1;
        }
@@ -58,7 +58,7 @@ pexecute (const char *program, char * const *argv, const char *pname,
     {
       if (pex == NULL)
        {
-         *errmsg_fmt = "pexecute not in progress";
+         *errmsg_fmt = (char *) "pexecute not in progress";
          *errmsg_arg = NULL;
          return -1;
        }

diff --git a/libiberty/regex.c b/libiberty/regex.c
index 9d3e532..b7be99d 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -7814,7 +7814,7 @@ re_comp (const char *s)
   if (!s)
     {
       if (!re_comp_buf.buffer)
-       return gettext ("No previous regular expression");
+       return (char *) gettext ("No previous regular expression");
       return 0;
     }