merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6c8c8f11499e9013501df4d4f0311cd529f5fb37..3f7c77faac3c87d9593faa65650d49d65a05f40e 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-16  Loren J. Rittle  <ljrittle@acm.org>
+
+       * cplus-dem.c (main): Initialize style.
+       
 2001-01-31  Bryce McKinlay  <bryce@albatross.co.nz>
 
        Add support for Java demangling under the v3 ABI:

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index d49ec7c7e1dd60601488c03e174867d28194c435..1d2a4756606beaf23ccd99b23270898465f62156 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -5050,7 +5050,7 @@ main (argc, argv)
   char *result;
   int c;
   const char *valid_symbols;
-  enum demangling_styles style;
+  enum demangling_styles style = auto_demangling;
 
   program_name = argv[0];