merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3f7c77faac3c87d9593faa65650d49d65a05f40e..f8988392db22cf32037886758bbdbbe7cd1f607c 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-04  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+       * cplus-dem.c (main): Cast enum style to int.
+       
 2001-02-16  Loren J. Rittle  <ljrittle@acm.org>
 
        * cplus-dem.c (main): Initialize style.

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 1d2a4756606beaf23ccd99b23270898465f62156..6133e6e1d40bbe8b3ff556de93f803dbc5a87a67 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -5148,7 +5148,7 @@ main (argc, argv)
                skip_first = i;
 
              mbuffer[i] = 0;
-             flags |= style;
+             flags |= (int) style;
              result = cplus_demangle (mbuffer + skip_first, flags);
              if (result)
                {