From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6340 invoked by alias); 5 Apr 2012 18:35:31 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 5986 invoked by uid 9674); 5 Apr 2012 18:35:30 -0000 Date: Thu, 05 Apr 2012 18:35:00 -0000 Message-ID: <20120405183530.5964.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-autoload: Merge branch 'pathvec0-1-secmove-misc2-safepath-debug-warn' into pathvec0-1-secmove-misc2-safepath-debug-warn-warnlocal X-Git-Refname: refs/heads/archer-jankratochvil-autoload X-Git-Reftype: branch X-Git-Oldrev: d79b077ec588f6e87cff07aa0002b22e5e8c9161 X-Git-Newrev: 110ae17b1e9a3803811ad5c97955d4348565a1fe X-SW-Source: 2012-q2/txt/msg00012.txt.bz2 List-Id: The branch, archer-jankratochvil-autoload has been updated via 110ae17b1e9a3803811ad5c97955d4348565a1fe (commit) via da44d15c57a7a10dd54b4440635a7f5cda6943c8 (commit) via 6cff2a168b1d623a98224acab97b26d7452b20e9 (commit) via f1a415a89d1094828b7ced032443eb39b06a3b8d (commit) via 927b5a006e14502927fb67d7f4141462649b31ca (commit) via b4f63a2cb0931ab3a5148b078d73eb5b12869b45 (commit) via e1529c0d555cabbc469d98684fcdda83938258a3 (commit) via ff6623237cb959ad350cc24918ebe466fa760418 (commit) via 914154c96229ca494cd8fe8f02690306aae3a8e0 (commit) via 4d3778d202bbeff0811e415ae06d4af3492d3ab4 (commit) via 156ec04c92e224ffb710e9195cbd96ad020521a9 (commit) via 27c28fe1d48497a00fd8d0b55d2551180a90d252 (commit) via 9059d37e18a4e1d9b10acb977998ffd35e90913f (commit) via a79ab0d640b54e10e2ea9d7e570a8aade84882c1 (commit) via f6882df63f26847961d6bfd5b1ea152450e09342 (commit) via 2fa2f74066a3855b779e05069ced92d51cc2bfd9 (commit) via a03b2a19f7404deddc24e11ae7719852d3732d9d (commit) via 71bc2b40408f0e64af29e6e5e5cc3864005072af (commit) via 16c3d856ccd841733a12f0b03bb8986647f4b8d3 (commit) via 16cdaf6b29a89dc13fd92c6aca6ad965f8e46cf0 (commit) via 6d622d1440380dfb3e3532cf8808a284ca3da045 (commit) via 0bb06c58fcb183269acd83d0990ff4098af8cbec (commit) via 02c07dfcef2d2ec5764f5983854feeff2ea2823d (commit) via 803cf548486ab0fb592e67c98dad739bfef11c01 (commit) via beb222f49131cfba7fbc54d7383d1a90e81d42d7 (commit) via 5886f28ed05f4cafcca634f8e2d699ecb53700c2 (commit) via a8bd82d58ec5b90a545413893d6b88cc4a464265 (commit) from d79b077ec588f6e87cff07aa0002b22e5e8c9161 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 110ae17b1e9a3803811ad5c97955d4348565a1fe Merge: 927b5a0 da44d15 Author: Jan Kratochvil Date: Thu Apr 5 20:35:17 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug-warn' into pathvec0-1-secmove-misc2-safepath-debug-warn-warnlocal commit da44d15c57a7a10dd54b4440635a7f5cda6943c8 Merge: b4f63a2 6cff2a1 Author: Jan Kratochvil Date: Thu Apr 5 20:35:17 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug' into pathvec0-1-secmove-misc2-safepath-debug-warn commit 6cff2a168b1d623a98224acab97b26d7452b20e9 Merge: 914154c f1a415a Author: Jan Kratochvil Date: Thu Apr 5 20:35:16 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath' into pathvec0-1-secmove-misc2-safepath-debug commit f1a415a89d1094828b7ced032443eb39b06a3b8d Author: Jan Kratochvil Date: Thu Apr 5 20:35:14 2012 +0200 . commit 927b5a006e14502927fb67d7f4141462649b31ca Merge: e1529c0 b4f63a2 Author: Jan Kratochvil Date: Thu Apr 5 20:33:35 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug-warn' into pathvec0-1-secmove-misc2-safepath-debug-warn-warnlocal commit b4f63a2cb0931ab3a5148b078d73eb5b12869b45 Author: Jan Kratochvil Date: Thu Apr 5 20:33:16 2012 +0200 . commit e1529c0d555cabbc469d98684fcdda83938258a3 Merge: f6882df ff66232 Author: Jan Kratochvil Date: Thu Apr 5 20:30:40 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug-warn' into pathvec0-1-secmove-misc2-safepath-debug-warn-warnlocal commit ff6623237cb959ad350cc24918ebe466fa760418 Merge: 2fa2f74 914154c Author: Jan Kratochvil Date: Thu Apr 5 20:30:40 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug' into pathvec0-1-secmove-misc2-safepath-debug-warn commit 914154c96229ca494cd8fe8f02690306aae3a8e0 Merge: a03b2a1 4d3778d Author: Jan Kratochvil Date: Thu Apr 5 20:30:39 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath' into pathvec0-1-secmove-misc2-safepath-debug commit 4d3778d202bbeff0811e415ae06d4af3492d3ab4 Merge: 71bc2b4 156ec04 Author: Jan Kratochvil Date: Thu Apr 5 20:30:39 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2' into pathvec0-1-secmove-misc2-safepath commit 156ec04c92e224ffb710e9195cbd96ad020521a9 Merge: 16c3d85 27c28fe Author: Jan Kratochvil Date: Thu Apr 5 20:30:39 2012 +0200 Merge branch 'pathvec0-1-secmove' into pathvec0-1-secmove-misc2 commit 27c28fe1d48497a00fd8d0b55d2551180a90d252 Merge: c33e0d9 9059d37 Author: Jan Kratochvil Date: Thu Apr 5 20:30:39 2012 +0200 Merge branch 'pathvec0-1' into pathvec0-1-secmove commit 9059d37e18a4e1d9b10acb977998ffd35e90913f Merge: 838c848 a79ab0d Author: Jan Kratochvil Date: Thu Apr 5 20:30:39 2012 +0200 Merge branch 'pathvec0' into pathvec0-1 commit a79ab0d640b54e10e2ea9d7e570a8aade84882c1 Merge: 637f93e 0bb06c5 Author: Jan Kratochvil Date: Thu Apr 5 20:30:39 2012 +0200 Merge remote-tracking branch 'gdb/master' into pathvec0 commit f6882df63f26847961d6bfd5b1ea152450e09342 Merge: 16cdaf6 2fa2f74 Author: Jan Kratochvil Date: Thu Apr 5 20:30:16 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug-warn' into pathvec0-1-secmove-misc2-safepath-debug-warn-warnlocal commit 2fa2f74066a3855b779e05069ced92d51cc2bfd9 Merge: 6d622d1 a03b2a1 Author: Jan Kratochvil Date: Thu Apr 5 20:30:16 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug' into pathvec0-1-secmove-misc2-safepath-debug-warn commit a03b2a19f7404deddc24e11ae7719852d3732d9d Merge: 1f006e4 71bc2b4 Author: Jan Kratochvil Date: Thu Apr 5 20:30:15 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath' into pathvec0-1-secmove-misc2-safepath-debug commit 71bc2b40408f0e64af29e6e5e5cc3864005072af Merge: dc67b40 16c3d85 Author: Jan Kratochvil Date: Thu Apr 5 20:30:13 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2' into pathvec0-1-secmove-misc2-safepath Conflicts: gdb/doc/gdb.texinfo commit 16c3d856ccd841733a12f0b03bb8986647f4b8d3 Author: Jan Kratochvil Date: Thu Apr 5 20:29:46 2012 +0200 . commit 16cdaf6b29a89dc13fd92c6aca6ad965f8e46cf0 Merge: d79b077 6d622d1 Author: Jan Kratochvil Date: Thu Apr 5 18:51:42 2012 +0200 Merge branch 'pathvec0-1-secmove-misc2-safepath-debug-warn' into pathvec0-1-secmove-misc2-safepath-debug-warn-warnlocal commit 6d622d1440380dfb3e3532cf8808a284ca3da045 Author: Jan Kratochvil Date: Thu Apr 5 18:51:38 2012 +0200 . commit 0bb06c58fcb183269acd83d0990ff4098af8cbec Author: Pedro Alves Date: Thu Apr 5 11:20:50 2012 +0000 2012-04-05 Pedro Alves -Werror=strict-aliasing * spu-low.c (parse_spufs_run): Avoid dereferencing type-punned pointer. commit 02c07dfcef2d2ec5764f5983854feeff2ea2823d Author: Alan Modra Date: Thu Apr 5 00:00:05 2012 +0000 daily update commit 803cf548486ab0fb592e67c98dad739bfef11c01 Author: gdbadmin Date: Thu Apr 5 00:00:02 2012 +0000 *** empty log message *** commit beb222f49131cfba7fbc54d7383d1a90e81d42d7 Author: Pedro Alves Date: Wed Apr 4 14:42:15 2012 +0000 2012-04-04 Pedro Alves * linux-sparc-low.c (sparc_fill_gregset_to_stack) (sparc_store_gregset_from_stack, sparc_store_gregset) (sparc_breakpoint_at): Fix formatting. ----------------------------------------------------------------------- Summary of changes: bfd/version.h | 2 +- gdb/doc/gdb.texinfo | 26 +++++++++++++------------- gdb/gdbserver/ChangeLog | 13 +++++++++++++ gdb/gdbserver/linux-sparc-low.c | 26 +++++++++++++++----------- gdb/gdbserver/spu-low.c | 6 +++--- gdb/main.c | 4 ++++ gdb/version.in | 2 +- 7 files changed, 50 insertions(+), 29 deletions(-) First 500 lines of diff: diff --git a/bfd/version.h b/bfd/version.h index ab9eeed..7ec4f3e 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20120403 +#define BFD_VERSION_DATE 20120405 #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/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 1137665..2959310 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -1294,7 +1294,7 @@ init file, one generic in your home directory, and another, specific to the program you are debugging, in the directory where you invoke @value{GDBN}. -This feature is deprecated, please use @ref{@var{objfile}-gdb.gdb file} +This feature is deprecated, please use @ref{objfile-gdb.gdb file} instead. The canned sequence of commands will be then specific for loaded @var{objfile}---typically the main executable---after converting an init file in the current directory into the @var{objfile}-gdb.gdb file.. @@ -20775,9 +20775,9 @@ Yes /home/user/gdb/gdb-gdb.py These are various kinds of files @value{GDBN} can automatically load: @multitable {@xref{dotdebug_gdb_scripts section}.} {See @ref{set auto-load python-scripts}} -@item @xref{@var{objfile}-gdb.py file}. +@item @xref{objfile-gdb.py file}. @tab See @ref{set auto-load python-scripts}. -@item @xref{@var{objfile}-gdb.gdb file}. +@item @xref{objfile-gdb.gdb file}. @tab See @ref{set auto-load gdb-scripts}. @item @xref{dotdebug_gdb_scripts section}. @tab See @ref{set auto-load python-scripts}. @@ -20831,7 +20831,7 @@ These are @value{GDBN} control commands for the auto-loading: @menu * Init File in the Current Directory:: @samp{set/show/info auto-load local-gdbinit} * libthread_db.so.1 file:: @samp{set/show/info auto-load libthread-db} -* @var{objfile}-gdb.gdb file:: @samp{set/show/info auto-load gdb-script} +* objfile-gdb.gdb file:: @samp{set/show/info auto-load gdb-script} * Auto-loading safe path:: @samp{set/show/info auto-load safe-path} * Auto-loading verbose mode:: @samp{set/show debug auto-load} @xref{Python Auto-loading}. @@ -20854,7 +20854,7 @@ Enable or disable the auto-loading of canned sequences of commands The options @samp{warn-and-X} give warning before loading (@samp{warn-and-yes}) or when declining to load (@samp{warn-and-no}) the file as the @samp{local-gdbinit} feature is deprecated in favor -of @xref{@var{objfile}-gdb.gdb file}. +of @xref{objfile-gdb.gdb file}. @anchor{show auto-load local-gdbinit} @kindex show auto-load local-gdbinit @@ -20905,7 +20905,7 @@ Print the list of all loaded inferior specific thread debugging libraries and for each such library print list of inferior @var{pid}s using it. @end table -@node @var{objfile}-gdb.gdb file +@node objfile-gdb.gdb file @subsection The @file{@var{objfile}-gdb.gdb} file @cindex auto-loading @file{@var{objfile}-gdb.gdb} @@ -20914,7 +20914,7 @@ canned sequences of commands (@pxref{Sequences}), as long as @samp{set auto-load gdb-scripts} is set to @samp{yes}. For more background refer to the similar Python scripts auto-loading -description (@pxref{@var{objfile}-gdb.py file}). +description (@pxref{objfile-gdb.py file}). @table @code @anchor{set auto-load gdb-scripts} @@ -21030,8 +21030,8 @@ Disable auto-loading globally for the user use system init file instead (@pxref{System-wide configuration}). @end itemize -This setting applies to the pathnames as entered by user. If no entry matches -@value{GDBN} tries as a last resort to also resolve all the pathnames into +This setting applies to the file names as entered by user. If no entry matches +@value{GDBN} tries as a last resort to also resolve all the file names into their canonical form (typically resolving symbolic links) and compare the entries again. @value{GDBN} already canonicalizes most of the filenames on its own before starting the comparison so a canonical form of directories is @@ -25097,12 +25097,12 @@ writable. @node Python Auto-loading @subsection Python Auto-loading -@cindex Python auto-loading, Python +@cindex Python auto-loading When a new object file is read (for example, due to the @code{file} command, or because the inferior has loaded a shared library), @value{GDBN} will look for Python support scripts in several ways: -@file{@var{objfile}-gdb.py} (@pxref{@var{objfile}-gdb.py file}) +@file{@var{objfile}-gdb.py} (@pxref{objfile-gdb.py file}) and @code{.debug_gdb_scripts} section (@pxref{dotdebug_gdb_scripts section}). @@ -25155,12 +25155,12 @@ function (@pxref{Objfiles In Python}). This can be useful for registering objfile-specific pretty-printers. @menu -* @var{objfile}-gdb.py file:: The @file{@var{objfile}-gdb.py} file +* objfile-gdb.py file:: The @file{@var{objfile}-gdb.py} file * dotdebug_gdb_scripts section:: The @code{.debug_gdb_scripts} section * Which flavor to choose?:: @end menu -@node @var{objfile}-gdb.py file +@node objfile-gdb.py file @subsubsection The @file{@var{objfile}-gdb.py} file @cindex @file{@var{objfile}-gdb.py} diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index cd53c66..25d9cb3 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,16 @@ +2012-04-05 Pedro Alves + + -Werror=strict-aliasing + + * spu-low.c (parse_spufs_run): Avoid dereferencing type-punned + pointer. + +2012-04-04 Pedro Alves + + * linux-sparc-low.c (sparc_fill_gregset_to_stack) + (sparc_store_gregset_from_stack, sparc_store_gregset) + (sparc_breakpoint_at): Fix formatting. + 2012-03-30 Thiago Jung Bauermann * configure.ac: Check whether Elf32_auxv_t and Elf64_auxv_t diff --git a/gdb/gdbserver/linux-sparc-low.c b/gdb/gdbserver/linux-sparc-low.c index 0460587..78d5409 100644 --- a/gdb/gdbserver/linux-sparc-low.c +++ b/gdb/gdbserver/linux-sparc-low.c @@ -119,19 +119,21 @@ sparc_fill_gregset_to_stack (struct regcache *regcache, const void *buf) int i; CORE_ADDR addr = 0; unsigned char tmp_reg_buf[8]; - const int l0_regno = find_regno("l0"); + const int l0_regno = find_regno ("l0"); const int i7_regno = l0_regno + 15; /* These registers have to be stored in the stack. */ - memcpy(&addr, ((char *) buf) + sparc_regmap[find_regno("sp")], sizeof(addr)); + memcpy (&addr, + ((char *) buf) + sparc_regmap[find_regno ("sp")], + sizeof (addr)); addr += BIAS; for (i = l0_regno; i <= i7_regno; i++) { collect_register (regcache, i, tmp_reg_buf); - (*the_target->write_memory) (addr, tmp_reg_buf, sizeof(tmp_reg_buf)); - addr += sizeof(tmp_reg_buf); + (*the_target->write_memory) (addr, tmp_reg_buf, sizeof (tmp_reg_buf)); + addr += sizeof (tmp_reg_buf); } } @@ -169,19 +171,21 @@ sparc_store_gregset_from_stack (struct regcache *regcache, const void *buf) int i; CORE_ADDR addr = 0; unsigned char tmp_reg_buf[8]; - const int l0_regno = find_regno("l0"); + const int l0_regno = find_regno ("l0"); const int i7_regno = l0_regno + 15; /* These registers have to be obtained from the stack. */ - memcpy(&addr, ((char *) buf) + sparc_regmap[find_regno("sp")], sizeof(addr)); + memcpy (&addr, + ((char *) buf) + sparc_regmap[find_regno ("sp")], + sizeof (addr)); addr += BIAS; for (i = l0_regno; i <= i7_regno; i++) { - (*the_target->read_memory) (addr, tmp_reg_buf, sizeof(tmp_reg_buf)); + (*the_target->read_memory) (addr, tmp_reg_buf, sizeof (tmp_reg_buf)); supply_register (regcache, i, tmp_reg_buf); - addr += sizeof(tmp_reg_buf); + addr += sizeof (tmp_reg_buf); } } @@ -192,7 +196,7 @@ sparc_store_gregset (struct regcache *regcache, const void *buf) char zerobuf[8]; int range; - memset (zerobuf, 0, sizeof(zerobuf)); + memset (zerobuf, 0, sizeof (zerobuf)); for (range = 0; range < N_GREGS_RANGES; range++) for (i = gregs_ranges[range].regno_start; @@ -241,9 +245,9 @@ sparc_breakpoint_at (CORE_ADDR where) { unsigned char insn[INSN_SIZE]; - (*the_target->read_memory) (where, (unsigned char *) insn, sizeof(insn)); + (*the_target->read_memory) (where, (unsigned char *) insn, sizeof (insn)); - if (memcmp(sparc_breakpoint, insn, sizeof(insn)) == 0) + if (memcmp (sparc_breakpoint, insn, sizeof (insn)) == 0) return 1; /* If necessary, recognize more trap instructions here. GDB only diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 2a720ae..1ecd60c 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -206,14 +206,14 @@ store_ppc_memory (CORE_ADDR memaddr, char *myaddr, int len) static int parse_spufs_run (int *fd, CORE_ADDR *addr) { - char buf[4]; + unsigned int insn; CORE_ADDR pc = fetch_ppc_register (32); /* nip */ /* Fetch instruction preceding current NIP. */ - if (fetch_ppc_memory (pc-4, buf, 4) != 0) + if (fetch_ppc_memory (pc-4, (char *) &insn, 4) != 0) return 0; /* It should be a "sc" instruction. */ - if (*(unsigned int *)buf != INSTR_SC) + if (insn != INSTR_SC) return 0; /* System call number should be NR_spu_run. */ if (fetch_ppc_register (0) != NR_spu_run) diff --git a/gdb/main.c b/gdb/main.c index 1c70229..a6dc2ab 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -974,6 +974,10 @@ captured_main (void *data) { struct stat statbuf; + /* Ensure memcmp works even with fields padding. + LOCAL_GDBINIT_STAT is already pre-cleared. */ + memset (&statbuf, 0, sizeof (statbuf)); + if (fstat (fd, &statbuf) == 0 && memcmp (&statbuf, &local_gdbinit_stat, sizeof (statbuf)) == 0) diff --git a/gdb/version.in b/gdb/version.in index 88cc241..233551e 100644 --- a/gdb/version.in +++ b/gdb/version.in @@ -1 +1 @@ -7.4.50.20120403-cvs +7.4.50.20120405-cvs hooks/post-receive -- Repository for Project Archer.