[SCM] master: Merge remote branch 'gdb/master'

[jkratoch@sourceware.org]

The branch, master has been updated
       via  b740cdc6ca5f28027a4578bfb974cbd01698884e (commit)
       via  820c30fe5d9e2c072281690e793ee3f6cdeaed0c (commit)
       via  4721f3a9753cf95f08523fab5927400de6d6fef0 (commit)
       via  733c345671b25437177c7c98e0bcec71cf21ea8c (commit)
      from  b36cedcbca4e38c1ec982db3727d8f39815d0005 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit b740cdc6ca5f28027a4578bfb974cbd01698884e
Merge: b36cedcbca4e38c1ec982db3727d8f39815d0005 820c30fe5d9e2c072281690e793ee3f6cdeaed0c
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Nov 21 10:23:58 2009 +0100

    Merge remote branch 'gdb/master'

commit 820c30fe5d9e2c072281690e793ee3f6cdeaed0c
Author: Pedro Alves <pedro@codesourcery.com>
Date:   Sat Nov 21 05:17:40 2009 +0000

    	* gdb.cp/cplusfuncs.exp (info_func_regexp, print_addr): Don't
    	assume new `regsub' syntax available.

commit 4721f3a9753cf95f08523fab5927400de6d6fef0
Author: gdbadmin <gdbadmin@sourceware.org>
Date:   Sat Nov 21 00:00:33 2009 +0000

    *** empty log message ***

commit 733c345671b25437177c7c98e0bcec71cf21ea8c
Author: Alan Modra <amodra@bigpond.net.au>
Date:   Fri Nov 20 23:00:04 2009 +0000

    daily update

-----------------------------------------------------------------------

Summary of changes:
 bfd/version.h                       |    2 +-
 gdb/testsuite/ChangeLog             |    5 +++++
 gdb/testsuite/gdb.cp/cplusfuncs.exp |    4 ++--
 gdb/version.in                      |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/bfd/version.h b/bfd/version.h
index d5158f5..0c4c900 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20091120
+#define BFD_VERSION_DATE 20091121
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6bdf95a..5caae10 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-21  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.cp/cplusfuncs.exp (info_func_regexp, print_addr): Don't
+	assume new `regsub' syntax available.
+
 2009-11-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/watchpoint-hw-hit-once.exp,
diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index 607dceb..092c0ff 100644
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
@@ -241,7 +241,7 @@ proc info_func_regexp { name demangled } {
     global gdb_prompt
 
     send_gdb "info function $name\n"
-    set demangled [regsub {\\\(void\\\)} $demangled {\(\)}]
+    regsub {\\\(void\\\)} $demangled {\(\)} demangled
     gdb_expect {
 	-re ".*File .*:\r\n(class |)$demangled\r\n.*$gdb_prompt $" {
 	    pass "info function for \"$name\""
@@ -328,7 +328,7 @@ proc print_addr_2_kfail { name good bad bugid } {
 #
 
 proc print_addr { name } {
-    set expected [regsub {\(void\)} $name {()}]
+    regsub {\(void\)} $name {()} expected
     if {[string first "::" $name] == -1} {
 	# C function -- must be qutoed
 	set name "'$name'"
diff --git a/gdb/version.in b/gdb/version.in
index 58cb08d..c12c598 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.0.50.20091120-cvs
+7.0.50.20091121-cvs


hooks/post-receive
--
Repository for Project Archer.