From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31428 invoked by alias); 8 Dec 2010 15:55:35 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 31387 invoked by uid 9514); 8 Dec 2010 15:55:34 -0000 Date: Wed, 08 Dec 2010 15:55:00 -0000 Message-ID: <20101208155534.31370.qmail@sourceware.org> From: pmuldoon@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] master: Merge remote branch 'gdb/master' X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e857f088aa2014034c13a16a6f3371a57121bb46 X-Git-Newrev: b1463fe8242bc8a3ff48142ccf92a8c6848f59f9 X-SW-Source: 2010-q4/txt/msg00111.txt.bz2 List-Id: The branch, master has been updated via b1463fe8242bc8a3ff48142ccf92a8c6848f59f9 (commit) via a2c1503ec49af285b5d301ff6d47e34a17a152f7 (commit) via 8d84f1b4d57be1385c4c778e522edf6c4f2fa408 (commit) via 7c87f1bb2041e03818d3705f8719dad2a8c30d9b (commit) via 68db70f05288f15c45bd62a8de6e84677f0fb985 (commit) via 063caa6468033583e6ba78c8f88273de2c0ebb92 (commit) via 47ec54a885067d30025c3adeca6bb7859196d1c0 (commit) via 208f1fe14d05fae1b312d5c4f93d2fbcba7ec099 (commit) via affaea642de48625e4f2c2c5f94e45da9d49a9d5 (commit) via 2575f0876960e6a2f687a3fa5ac9e78eb5c3bc41 (commit) via 10324b77c51dfcb388dfe6c73e4ba899c4299be0 (commit) via 3b8b668119f4e13c43e0b48a87d89bc2303433c6 (commit) from e857f088aa2014034c13a16a6f3371a57121bb46 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit b1463fe8242bc8a3ff48142ccf92a8c6848f59f9 Merge: e857f08 a2c1503 Author: Phil Muldoon Date: Wed Dec 8 15:55:24 2010 +0000 Merge remote branch 'gdb/master' commit a2c1503ec49af285b5d301ff6d47e34a17a152f7 Author: gdbadmin Date: Wed Dec 8 00:00:03 2010 +0000 *** empty log message *** commit 8d84f1b4d57be1385c4c778e522edf6c4f2fa408 Author: Alan Modra Date: Tue Dec 7 23:00:05 2010 +0000 daily update commit 7c87f1bb2041e03818d3705f8719dad2a8c30d9b Author: Ian Lance Taylor Date: Tue Dec 7 21:20:22 2010 +0000 * configure.ac: Always set default for poststage1_ldflags to -static-libstdc++ -static-libgcc. commit 68db70f05288f15c45bd62a8de6e84677f0fb985 Author: Ian Lance Taylor Date: Tue Dec 7 21:20:22 2010 +0000 * configure.ac: Always set default for poststage1_ldflags to -static-libstdc++ -static-libgcc. commit 063caa6468033583e6ba78c8f88273de2c0ebb92 Author: Doug Evans Date: Tue Dec 7 17:30:48 2010 +0000 * dwarf2read.c (dw2_lookup_symtab): Remove duplicate call to gdb_realpath. commit 47ec54a885067d30025c3adeca6bb7859196d1c0 Author: Doug Evans Date: Tue Dec 7 17:26:00 2010 +0000 PR python/12227 * NEWS: Mention -data-directory. * main.c (captured_main): Recognize -data-directory. doc/ * gdb.texinfo (Mode Options): Document -data-directory. (Data Files): Add reference to -data-directory. testsuite/ * gdb.base/catch-syscall.exp (do_syscall_tests): Remove setting of data-directory. * lib/gdb-python.exp (gdb_check_python_config): Delete, all callers updated. * lib/gdb.exp (INTERNAL_GDBFLAGS): Add -data-directory. commit 208f1fe14d05fae1b312d5c4f93d2fbcba7ec099 Author: gdbadmin Date: Tue Dec 7 00:00:02 2010 +0000 *** empty log message *** commit affaea642de48625e4f2c2c5f94e45da9d49a9d5 Author: Alan Modra Date: Mon Dec 6 23:00:04 2010 +0000 daily update commit 2575f0876960e6a2f687a3fa5ac9e78eb5c3bc41 Author: H.J. Lu Date: Mon Dec 6 20:25:49 2010 +0000 Use putchar for the trailing `\n' in plugin message. bfd/ 2010-12-06 Dmitry Gorbachev PR ld/12288 * plugin.c (message): Add putchar for the trailing `\n'. ld/ 2010-12-06 Dmitry Gorbachev PR ld/12288 * plugin.c (message): Use putchar for the trailing `\n'. commit 10324b77c51dfcb388dfe6c73e4ba899c4299be0 Author: Marc Khouzam Date: Mon Dec 6 14:16:42 2010 +0000 2010-12-06 Marc Khouzam * mi/mi-parse.c (mi_parse): Missing else. commit 3b8b668119f4e13c43e0b48a87d89bc2303433c6 Author: Alexandre Oliva Date: Mon Dec 6 13:00:26 2010 +0000 Check in for PR other/46020 was meant for PR other/46026. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 ++++++- bfd/ChangeLog | 5 +++++ bfd/plugin.c | 1 + bfd/version.h | 2 +- configure | 8 ++++---- configure.ac | 8 ++++---- gdb/ChangeLog | 13 +++++++++++++ gdb/NEWS | 5 +++++ gdb/doc/ChangeLog | 5 +++++ gdb/doc/gdb.texinfo | 10 ++++++++++ gdb/dwarf2read.c | 13 ++++--------- gdb/main.c | 5 +++++ gdb/mi/mi-parse.c | 2 +- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.base/catch-syscall.exp | 4 ++-- gdb/testsuite/gdb.python/lib-types.exp | 3 --- gdb/testsuite/gdb.python/py-pp-maint.exp | 3 --- gdb/testsuite/lib/gdb-python.exp | 18 ------------------ gdb/testsuite/lib/gdb.exp | 2 +- gdb/version.in | 2 +- 20 files changed, 76 insertions(+), 48 deletions(-) First 500 lines of diff: diff --git a/ChangeLog b/ChangeLog index 50e96fe..fbe634e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * configure.ac (cris-*-elf, crisv32-*-elf): Disable target-libffi. * configure: Regenerate. +2010-12-02 Ian Lance Taylor + + * configure.ac: Always set default for poststage1_ldflags to + -static-libstdc++ -static-libgcc. + 2010-12-02 Jeff Johnston * COPYING.NEWLIB: Add National Semiconductor notice. @@ -15,7 +20,7 @@ 2010-11-26 Alexandre Oliva - PR other/46020 + PR other/46026 * configure.ac (CXX_FOR_TARGET): Add -funconfigured-libstdc++-v3. * Makefile.def (CXX_FOR_TARGET): Removed from flags_to_pass. * Makefile.tpl (CXX_FOR_TARGET_FLAG_TO_PASS): New. diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 16f5536..009a020 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-12-06 Dmitry Gorbachev + + PR ld/12288 + * plugin.c (message): Add putchar for the trailing `\n'. + 2010-12-04 Mike Frysinger * Makefile.am (!INSTALL_LIBBFD/bfdinclude_HEADERS): Set to nothing. diff --git a/bfd/plugin.c b/bfd/plugin.c index a46bf90..61cd687 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -78,6 +78,7 @@ message (int level ATTRIBUTE_UNUSED, va_start (args, format); printf ("bfd plugin: "); vprintf (format, args); + putchar ('\n'); va_end (args); return LDPS_OK; } diff --git a/bfd/version.h b/bfd/version.h index bedfbca..684eafa 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20101206 +#define BFD_VERSION_DATE 20101208 #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/configure b/configure index 6a3ff45..6dde71a 100755 --- a/configure +++ b/configure @@ -5606,10 +5606,10 @@ if test "${with_boot_ldflags+set}" = set; then : fi else poststage1_ldflags= - # With --enable-build-with-cxx, default to linking libstdc++ and - # libgcc statically. But if the user explicitly specified the - # libraries to use, trust that they are doing what they want. - if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then + # In stages 2 and 3, default to linking libstdc++ and libgcc + # statically. But if the user explicitly specified the libraries to + # use, trust that they are doing what they want. + if test "$poststage1_libs" = ""; then poststage1_ldflags="-static-libstdc++ -static-libgcc" fi fi diff --git a/configure.ac b/configure.ac index 440f066..fcf5ba2 100644 --- a/configure.ac +++ b/configure.ac @@ -1561,10 +1561,10 @@ AC_ARG_WITH(boot-ldflags, poststage1_ldflags=$withval fi], [poststage1_ldflags= - # With --enable-build-with-cxx, default to linking libstdc++ and - # libgcc statically. But if the user explicitly specified the - # libraries to use, trust that they are doing what they want. - if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then + # In stages 2 and 3, default to linking libstdc++ and libgcc + # statically. But if the user explicitly specified the libraries to + # use, trust that they are doing what they want. + if test "$poststage1_libs" = ""; then poststage1_ldflags="-static-libstdc++ -static-libgcc" fi]) AC_SUBST(poststage1_ldflags) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b2dd553..6611a84 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2010-12-07 Doug Evans + + * dwarf2read.c (dw2_lookup_symtab): Remove duplicate call to + gdb_realpath. + + PR python/12227 + * NEWS: Mention -data-directory. + * main.c (captured_main): Recognize -data-directory. + +2010-12-06 Marc Khouzam + + * mi/mi-parse.c (mi_parse): Missing else. + 2010-12-04 Masaki Muranaka * configure.tgt: Accept microblaze*-*-linux* for linux target diff --git a/gdb/NEWS b/gdb/NEWS index f1efcd2..9dfb249 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -3,6 +3,11 @@ *** Changes since GDB 7.2 +* New command line options + +-data-directory DIR Specify DIR as the "data-directory". + This is mostly for testing purposes. + * GDB has a new command: "set directories". It is like the "dir" command except that it replaces the source path list instead of augmenting it. diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 6b4f2bb..c1d0e1c 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-07 Doug Evans + + * gdb.texinfo (Mode Options): Document -data-directory. + (Data Files): Add reference to -data-directory. + 2010-11-29 Doug Evans * gdb.texinfo (Pretty-Printer Introduction): Change diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 422812c..dc9630a 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -1111,6 +1111,12 @@ used if possible. Run @value{GDBN} using @var{directory} as its working directory, instead of the current directory. +@item -data-directory @var{directory} +@cindex @code{--data-directory} +Run @value{GDBN} using @var{directory} as its data directory. +The data directory is where @value{GDBN} searches for its +auxiliary files. @xref{Data Files}. + @item -fullname @itemx -f @cindex @code{--fullname} @@ -15598,6 +15604,10 @@ You can set the default data directory by using the configure-time automatically if the installed @value{GDBN} is moved to a new location. +The data directory may also be specified with the +@code{--data-directory} command line option. +@xref{Mode Options}. + @node Targets @chapter Specifying a Debugging Target diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 31a08a7..1cc5258 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2199,16 +2199,11 @@ dw2_lookup_symtab (struct objfile *objfile, const char *name, const char *this_full_name = dw2_require_full_path (objfile, per_cu, j); - if (this_full_name != NULL) + if (this_full_name != NULL + && FILENAME_CMP (real_path, this_full_name) == 0) { - char *rp = gdb_realpath (this_full_name); - if (rp != NULL && FILENAME_CMP (real_path, rp) == 0) - { - xfree (rp); - *result = dw2_instantiate_symtab (objfile, per_cu); - return 1; - } - xfree (rp); + *result = dw2_instantiate_symtab (objfile, per_cu); + return 1; } } } diff --git a/gdb/main.c b/gdb/main.c index 9bd36cf..c686bd2 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -432,6 +432,7 @@ captured_main (void *data) {"i", required_argument, 0, 'i'}, {"directory", required_argument, 0, 'd'}, {"d", required_argument, 0, 'd'}, + {"data-directory", required_argument, 0, 'D'}, {"cd", required_argument, 0, OPT_CD}, {"tty", required_argument, 0, 't'}, {"baud", required_argument, 0, 'b'}, @@ -551,6 +552,10 @@ captured_main (void *data) batch_flag = batch_silent = 1; gdb_stdout = ui_file_new(); break; + case 'D': + xfree (gdb_datadir); + gdb_datadir = xstrdup (optarg); + break; #ifdef GDBTK case 'z': { diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index a5a4e75..4541b66 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -319,7 +319,7 @@ mi_parse (char *cmd) chp += 1; parse->thread_group = strtol (chp, &chp, 10); } - if (strncmp (chp, "--thread ", ts) == 0) + else if (strncmp (chp, "--thread ", ts) == 0) { if (parse->thread != -1) error (_("Duplicate '--thread' option")); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 569c7b6..523374e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-12-07 Doug Evans + + * gdb.base/catch-syscall.exp (do_syscall_tests): Remove setting + of data-directory. + * lib/gdb-python.exp (gdb_check_python_config): Delete, all callers + updated. + * lib/gdb.exp (INTERNAL_GDBFLAGS): Add -data-directory. + 2010-11-29 Michael Snyder * gdb.base/callfuncs.exp: Test for skip_float_tests. diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index 7845655..b84c0dd 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -277,8 +277,8 @@ proc test_catch_syscall_fail_nodatadir {} { proc do_syscall_tests {} { global gdb_prompt srcdir - # First, we need to set GDB datadir. - gdb_test_no_output "set data-directory [pwd]/../data-directory" + # NOTE: We don't have to point gdb at the correct data-directory. + # For the build tree that is handled by INTERNAL_GDBFLAGS. # Verify that the 'catch syscall' help is available set thistest "help catch syscall" diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp index 0599b0d..07480f5 100644 --- a/gdb/testsuite/gdb.python/lib-types.exp +++ b/gdb/testsuite/gdb.python/lib-types.exp @@ -44,9 +44,6 @@ if ![runto_main] then { return 0 } -# Ensure sys.path, et.al. are initialized properly. -gdb_check_python_config - gdb_test_no_output "python import gdb.types" # test get_basic_type const stripping diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp index 7474584..b613e41 100644 --- a/gdb/testsuite/gdb.python/py-pp-maint.exp +++ b/gdb/testsuite/gdb.python/py-pp-maint.exp @@ -51,9 +51,6 @@ if ![runto_main ] then { return -1 } -# Ensure sys.path, et.al. are initialized properly. -gdb_check_python_config - gdb_test "b [gdb_get_line_number {break to inspect} ${testfile}.c ]" \ ".*Breakpoint.*" gdb_test "continue" ".*Breakpoint.*" diff --git a/gdb/testsuite/lib/gdb-python.exp b/gdb/testsuite/lib/gdb-python.exp index 58deadc..4a15d7a 100644 --- a/gdb/testsuite/lib/gdb-python.exp +++ b/gdb/testsuite/lib/gdb-python.exp @@ -45,21 +45,3 @@ proc gdb_py_test_multiple { name args } { } return 0 } - -# Establish various python configuration parameters if necessary. -# E.g. sys.path. - -proc gdb_check_python_config { } { - global USE_INSTALLED_TREE - # If we're running an installed version of gdb, and we want to test the - # installed versions of the python support scripts, then we don't want - # to point data-directory at the build tree. - if { [info exists USE_INSTALLED_TREE] && "$USE_INSTALLED_TREE" == "yes" } { - verbose -log "Assuming system config already installed." - } else { - verbose -log "Installing system config from build tree." - set gdb_data_dir "[pwd]/../data-directory" - gdb_test_no_output "set data-directory $gdb_data_dir" - gdb_test_no_output "python GdbSetPythonDirectory ('$gdb_data_dir/python')" - } -} diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index fc8751f..50e2c70 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -56,7 +56,7 @@ verbose "using GDBFLAGS = $GDBFLAGS" 2 # INTERNAL_GDBFLAGS contains flags that the testsuite requires. global INTERNAL_GDBFLAGS if ![info exists INTERNAL_GDBFLAGS] { - set INTERNAL_GDBFLAGS "-nw -nx" + set INTERNAL_GDBFLAGS "-nw -nx -data-directory [pwd]/../data-directory" } # The variable gdb_prompt is a regexp which matches the gdb prompt. diff --git a/gdb/version.in b/gdb/version.in index 75d92f6..ee8ab53 100644 --- a/gdb/version.in +++ b/gdb/version.in @@ -1 +1 @@ -7.2.50.20101206-cvs +7.2.50.20101208-cvs hooks/post-receive -- Repository for Project Archer.