merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 176dd4daf7bce42314da9bc219bc4cde8923a997..eb47537024fce92b1b30888a2c2e393da6d340c7 100644 (file)
--- 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 ad496846904500d8de89476c8d52884c37b37ba1..420c7f4a47da26537ce0439a4716859c969fbd01 100644 (file)
--- 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,