From: DJ Delorie <dj@redhat.com>
Date: Wed, 13 Apr 2005 01:06:55 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: msnyder-tracepoint-checkpoint-branchpoint~620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=776dbd277f12a10a7dddd6ffe3c6bc9e66c4cbea;p=external%2Fbinutils.git

merge from gcc
---

diff --git a/libiberty/regex.c b/libiberty/regex.c
index 601bbf1..66f1ef8 100644
--- 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.  */