merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index d5e97f3..bdede48 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
+       * regex.c (wcs_re_match_2_internal, byte_re_match_2_internal):
+       Replace not with negate. 
+
+2005-04-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
        * configure.ac: Check declarations for basename, ffs, asprintf,
        vasprintf.
        * configure: Regenerate.

diff --git a/libiberty/regex.c b/libiberty/regex.c
index 601bbf1..66f1ef8 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -6174,7 +6174,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
 #endif /* WCHAR */
            boolean negate = (re_opcode_t) *(p - 1) == charset_not;
 
-            DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
+            DEBUG_PRINT2 ("EXECUTING charset%s.\n", negate ? "_not" : "");
            PREFETCH ();
            c = TRANSLATE (*d); /* The character to match.  */
 #ifdef WCHAR
@@ -6544,7 +6544,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
            negate = !negate;
 
          char_set_matched:
-           if (not) goto fail;
+           if (negate) goto fail;
 #else
             /* Cast to `unsigned' instead of `unsigned char' in case the
                bit list is a full 32 bytes long.  */