merge from gcc

libiberty/ChangeLog

@@ -1,5 +1,8 @@
 2002-01-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+	* cp-demangle.c (long_options): Const-ify.
+	* cplus-dem.c (long_options): Likewise.
+
 	* cplus-dem.c (mystrstr): Delete.  All callers changed to use
 	strstr instead.
 

libiberty/cp-demangle.c

@@ -3945,7 +3945,7 @@ print_usage (fp, exit_value)
 }
 
 /* Option specification for getopt_long.  */
-static struct option long_options[] = 
+static const struct option long_options[] = 
 {
   { "help",    no_argument, NULL, 'h' },
   { "strict",  no_argument, NULL, 's' },

libiberty/cplus-dem.c

@@ -4947,7 +4947,7 @@ extern int prepends_underscore;
 
 int strip_underscore = 0;
 
-static struct option long_options[] = {
+static const struct option long_options[] = {
   {"strip-underscores", no_argument, 0, '_'},
   {"format", required_argument, 0, 's'},
   {"help", no_argument, 0, 'h'},