diff options
| author | DJ Delorie <dj@redhat.com> | 2010-04-07 21:16:24 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-04-07 21:16:24 +0000 |
| commit | 45ecb02a77c46951cc295f519e2c36c4f999a047 (patch) | |
| tree | c2a039867fb74836e9734eb245f4b0d6a93152f3 | |
| parent | efc8d4f25fb033b23e14adabd74f312ef73824a9 (diff) | |
| download | gdb-45ecb02a77c46951cc295f519e2c36c4f999a047.zip gdb-45ecb02a77c46951cc295f519e2c36c4f999a047.tar.gz gdb-45ecb02a77c46951cc295f519e2c36c4f999a047.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/regex.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 176dd4d..eb47537 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2010-04-07 Jakub Jelinek <jakub@redhat.com> + + * regex.c (byte_re_match_2_internal): Avoid set but not used + warning. + 2010-03-22 Jason Merrill <jason@redhat.com> * cp-demangle.c (d_print_mod): Use () rather than [] for vectors. diff --git a/libiberty/regex.c b/libiberty/regex.c index ad49684..420c7f4 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -4,7 +4,7 @@ internationalization features.) Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2005 Free Software Foundation, Inc. + 2002, 2005, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -7140,8 +7140,8 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, register from the stack, since lowest will == highest in `pop_failure_point'. */ active_reg_t dummy_low_reg, dummy_high_reg; - UCHAR_T *pdummy = NULL; - const CHAR_T *sdummy = NULL; + UCHAR_T *pdummy ATTRIBUTE_UNUSED = NULL; + const CHAR_T *sdummy ATTRIBUTE_UNUSED = NULL; DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n"); POP_FAILURE_POINT (sdummy, pdummy, |