merge from gcc

2013-10-16 00:29:48 +00:00
parent 90c9b2c61c
commit 26505cc0c4
9 changed files with 56 additions and 2 deletions
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -1276,7 +1276,6 @@ d_name (struct d_info *di)
    case 'Z':
      return d_local_name (di);

-    case 'L':
    case 'U':
      return d_unqualified_name (di);

@@ -1323,6 +1322,7 @@ d_name (struct d_info *di)
 	return dc;
      }

+    case 'L':
    default:
      dc = d_unqualified_name (di);
      if (d_peek_char (di) == 'I')