merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index dbf7719ecc45067072081ce8c54a9dcbdd2da106..50bd29d61aa7b4e347728940963bce694e269bb9 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-20  jmc  <jmc@prioris.mini.pw.edu.pl>
+
+       * cplus_dem.c: Fix typo: intializes -> initializes.
+
 2003-02-20  Alexandre Oliva  <aoliva@redhat.com>
 
        * configure.in: Propagate ORIGINAL_LD_FOR_MULTILIBS to

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 5eb26a346172e9defeddf41da3dfc9dda3514df0..0b5a3e0b29e0c35a749346c90876131cffd5e8b9 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -1064,7 +1064,7 @@ ada_demangle (mangled, option)
 /* This function performs most of what cplus_demangle use to do, but
    to be able to demangle a name with a B, K or n code, we need to
    have a longer term memory of what types have been seen. The original
-   now intializes and cleans up the squangle code info, while internal
+   now initializes and cleans up the squangle code info, while internal
    calls go directly to this routine to avoid resetting that info. */
 
 static char *