merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 989547060f532ae4fe5f522f872793f9728ba707..5bb5073d842bbf41b7bc23a5e4defbbb0189c7a2 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-20  Jason Merrill  <jason@redhat.com>
+
+       * cplus-dem.c (main): Skip initial $.
+
 2001-03-15  Michael Meissner  <meissner@redhat.com>
 
        * hashtab.c (higher_prime_number): Silence warning that 4294967291

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 6133e6e1d40bbe8b3ff556de93f803dbc5a87a67..31a7555783b839dc9ce07d99a60b4feb99d8e274 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -5139,7 +5139,7 @@ main (argc, argv)
            {
              int skip_first = 0;
 
-             if (mbuffer[0] == '.')
+             if (mbuffer[0] == '.' || mbuffer[0] == '$')
                ++skip_first;
              if (strip_underscore && mbuffer[skip_first] == '_')
                ++skip_first;