merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5c70d68ad3d25d940b2e1b381f95401de69878a9..ee9da0feee75ed2b397a7ff47d92a2fec99e5124 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-12  Isamu Hasegawa  <isamu@yamato.ibm.com>
+
+       * regex.c (wcs_regex_compile): Use appropriate string
+       to compare with collating element.
+       Fix the padding for the alignment.
+
 2001-06-13  Andrew Cagney  <ac131313@redhat.com>
 
        * lbasename.c (lbasename): Change function definition to return a

diff --git a/libiberty/regex.c b/libiberty/regex.c
index 555d3bbf66aaebe74dd139b151277d5015216d15..f22047caa03b8b6858eaf6627115491b7f2fc045 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -3059,7 +3059,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
                                    /* First compare the hashing value.  */
                                    if (symb_table[2 * elem] == hash
                                        && c1 == extra[symb_table[2 * elem + 1]]
-                                       && memcmp (str,
+                                       && memcmp (char_str,
                                                   &extra[symb_table[2 * elem + 1]
                                                         + 1], c1) == 0)
                                      {
@@ -3079,7 +3079,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
                                       in the table.  */
                                    idx += 1 + extra[idx];
                                    /* Adjust for the alignment.  */
-                                   idx = (idx + 3) & ~4;
+                                   idx = (idx + 3) & ~3;
 
                                    str[0] = (wchar_t) idx + 4;
                                  }