espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-17 12:53:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie
2009-09-11 16:05:46 +00:00
parent 1e9cc1c27b
commit a05e8785c7
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libiberty/regex.c
View File

@ -5908,24 +5908,22 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
longest match, try backtracking. */ longest match, try backtracking. */
if (d != end_match_2) if (d != end_match_2)
{ {
/* 1 if this match ends in the same string (string1 or string2)
as the best previous match. */
boolean same_str_p = (FIRST_STRING_P (match_end)
== MATCHING_IN_FIRST_STRING);
/* 1 if this match is the best seen so far. */ /* 1 if this match is the best seen so far. */
boolean best_match_p; boolean best_match_p;
{ /* AIX compiler got confused when this was combined
/* 1 if this match ends in the same string (string1 or string2) with the previous declaration. */
as the best previous match. */ if (same_str_p)
boolean same_str_p = (FIRST_STRING_P (match_end) best_match_p = d > match_end;
== MATCHING_IN_FIRST_STRING); else
best_match_p = !MATCHING_IN_FIRST_STRING;
/* AIX compiler got confused when this was combined DEBUG_PRINT1 ("backtracking.\n");
with the previous declaration. */
if (same_str_p)
best_match_p = d > match_end;
else
best_match_p = !MATCHING_IN_FIRST_STRING;
DEBUG_PRINT1 ("backtracking.\n");
}
if (!FAIL_STACK_EMPTY ()) if (!FAIL_STACK_EMPTY ())
{ /* More failure points to try. */ { /* More failure points to try. */