merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 855333e8027087573b052763c0c92bf0b7e2e1ee..0e88ea3cc9e523d41403bdbd8d6cc838c3c7c7ee 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,8 +1,3 @@
-2011-05-17  Corinna Vinschen  <vinschen@redhat.com>
-
-       * strsignal.c (psignal): Change second parameter to const char *.
-       Fix comment accordingly.
-
 2011-04-20  Jim Meyering  <meyering@redhat.com>
 
        * cp-demint.c (cplus_demangle_v3_components): Remove useless

diff --git a/libiberty/strsignal.c b/libiberty/strsignal.c
index 3b56d16988be25771cda1ac15ee507baeb721b74..666b1b4f15e577ec2d18cb68fbea0c7f9777accf 100644 (file)
--- a/libiberty/strsignal.c
+++ b/libiberty/strsignal.c
@@ -538,7 +538,7 @@ strtosigno (const char *name)
 
 /*
 
-@deftypefn Supplemental void psignal (int @var{signo}, const char *@var{message})
+@deftypefn Supplemental void psignal (int @var{signo}, char *@var{message})
 
 Print @var{message} to the standard error, followed by a colon,
 followed by the description of the signal specified by @var{signo},
@@ -551,7 +551,7 @@ followed by a newline.
 #ifndef HAVE_PSIGNAL
 
 void
-psignal (int signo, const char *message)
+psignal (int signo, char *message)
 {
   if (signal_names == NULL)
     {