aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2001-08-13 02:25:01 +0000
committerDJ Delorie <dj@redhat.com>2001-08-13 02:25:01 +0000
commita9022147a2a0acc50711501271a727e6aaa7acc8 (patch)
tree4c3ea72a0c507c1dbd5f89c8b14eed313fbe1fb1 /libiberty
parent8ce8e6c1074ad3ad92d65492b601e1903af43761 (diff)
downloadgdb-a9022147a2a0acc50711501271a727e6aaa7acc8.zip
gdb-a9022147a2a0acc50711501271a727e6aaa7acc8.tar.gz
gdb-a9022147a2a0acc50711501271a727e6aaa7acc8.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/regex.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5c70d68..ee9da0f 100644
--- 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 555d3bb..f22047c 100644
--- 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;
}