From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 45972 invoked by alias); 12 Aug 2015 17:12:12 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 45954 invoked by uid 9674); 12 Aug 2015 17:12:11 -0000 Date: Wed, 12 Aug 2015 17:12:00 -0000 Message-ID: <20150812171211.45876.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] jankratochvil/gdbserverbuildid: sticky X-Git-Refname: refs/heads/jankratochvil/gdbserverbuildid X-Git-Reftype: branch X-Git-Oldrev: 9ae1f06399e4965ff710ddebb88cfa70198791df X-Git-Newrev: 7511e878a507fd83b0954e35afc5b1954bbf4b70 X-SW-Source: 2015-q3/txt/msg00026.txt.bz2 List-Id: The branch, jankratochvil/gdbserverbuildid has been updated discards 9ae1f06399e4965ff710ddebb88cfa70198791df (commit) discards 8be9b469327732a45b4567606024e5fe6da65cf4 (commit) discards 626306b225fc12f03571ddef81ae2f8c361c2737 (commit) discards c1a4ff6f9646357800e419fde811522835ec05bb (commit) discards c185ce8e835c1c65744659e8c95422e6b3d6e783 (commit) discards 89c9b4a3d6f624e5e4ed2dfc0518c097a549c35c (commit) discards 9cb2a20e52c40b89b6d7f76b4f2b71cee4e422a7 (commit) discards 962b1449d776fcb1bc2405455772c4e49107e57c (commit) discards 62beda73be124eecedd78f2be3edc3d2db79f9b7 (commit) discards 464ea6806dab89759c018e90b0e3c88cda65a32e (commit) discards 216b70135d40c6315ddf1982ec3b092aa3583e95 (commit) discards e95a4b50c05e5c3af8f0e40dc87eac9239573ba4 (commit) discards baff9316bd263237c339d44348a2c29e6122ce0f (commit) discards a1aafb809024e0b113cdbe59f51319a2bca75fb8 (commit) discards 243fc24ef9cd84a9254c33a99db4d2f6b45e902d (commit) discards bad79bcabe0ea79f7aaea2a75afbd863721e3391 (commit) discards 04738321e65ba17b1fd45e0e36f865ac2febfa44 (commit) discards 610f98208fb4f57e08e75a8d3b36731fbab08ca6 (commit) discards 15926a00baf920c1848b790dfe886441e84bcb76 (commit) discards a98186deee4e15cae470c6b6d43b76faf4e6baa6 (commit) discards d9d2bc9d327e07574b4d54b114c615c74056c73b (commit) discards ed7d51ae856df050eb7f1bcdc4b302fcc3f672da (commit) discards c36d116ad357bd1985f32c04e4df2725290d6020 (commit) discards e2a01faf51b2ea495c301078ba59b37d75896321 (commit) discards 0a1e61f418387228b61972c965ae6b93727f4bc1 (commit) discards 7b4697b6a9831f90f49eed3d585ae3f372229248 (commit) via 7511e878a507fd83b0954e35afc5b1954bbf4b70 (commit) via 9a3e9406df37eb937420653ae950677f907688ab (commit) via c035efd98527f99e03a0026bc780e70b25f976c4 (commit) via e42869d96a302327ce96454c0d2145543c2dcd3c (commit) via fc064e4f050405c777709428fba9753f76e0ad67 (commit) via a3c14f98032a338154ad1bd6b72aa3353011913f (commit) via 35a6c7e8a3a06d0d4312ca0ac61f775908404539 (commit) via 88db88f0eaa679a6003a0d937740aabd8645b9a1 (commit) via abde5b2f068ead085a2a1a3dee9dd0d38fa804ea (commit) via cdb53cfdd51ece48623559c9438781206c542cf6 (commit) via 131418d98260842d5c51faa491bd1f687b0cff1e (commit) via 105855d3ed65660d3f6b757deb2715bf4c51f9fe (commit) via a400763759a2134fb35b22fe16b905397d041df2 (commit) via cecf494e5c91889b2e14f9de601f80a66f9f1f0c (commit) via d3cfb809d3bf745a0ff88d8f859ec30d8c407a41 (commit) via 9306fee563612fbf22cfdd1ceaed88af5c5f0f9f (commit) via cc174ddeed447e0f7c5c352b3955c7444f27c9c5 (commit) via cb971af740e27acf7c9bddbcf3cb6561eac6c212 (commit) via 4e73026d7c026f25c550d587986b275964ce5af6 (commit) via 72b8f9888a26b0c219d5b833fcedffdd008b38ce (commit) via 7f8e7055a0c5a85ee69cd7e2afc5b94d04152b3e (commit) via 8f52371e0efe7ed06a907649d640ef477999a1fc (commit) via 60aea42fb6c8444c1dfb8fd418bbe89c05f3eed3 (commit) via 49085cd8f6606199af381a7e71b90a0279ec9e34 (commit) via 0eddadf0d2213ddafb0aa94da9fdef0c5c912d52 (commit) via d7c3003426921da562b581d161bf3eb736c11780 (commit) from 9ae1f06399e4965ff710ddebb88cfa70198791df (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 7511e878a507fd83b0954e35afc5b1954bbf4b70 Author: Jan Kratochvil Date: Wed Aug 12 18:05:45 2015 +0200 sticky Message-Id: <1433754079-10395-1-git-send-email-gbenson@redhat.com> Philippe Waroquiers wrote: > On Fri, 2015-06-05 at 12:22 +0100, Gary Benson wrote: > > Built and regtested on RHEL6.6 x86_64. > I tested with the last SVN version of the Valgrind gdbserver (that > supports qXfer:exec-file:read+). > > The patch introduces a regression: > with the patch, GDB does not anymore automatically load the > exec-file. > > I bypassed this problem by ignoring fake_pid_p in remote.c: > --- a/gdb/remote.c > +++ b/gdb/remote.c > @@ -1624,9 +1624,13 @@ remote_add_inferior (int fake_pid_p, int pid, int > attached, > inf->attach_flag = attached; > inf->fake_pid_p = fake_pid_p; > > - /* If no main executable is currently open then attempt to > - open the file that was executed to create this inferior. */ > - if (try_open_exec && get_exec_file (0) == NULL) > + /* Attempt to open the file that was executed to create this > + inferior. If the user has explicitly specified executable > + and/or symbol files then warn the user if their choices do > + not match. Otherwise, set exec_file and symfile_objfile to > + the new file. */ > + printf("fake_pid_p %d\n", fake_pid_p); > + if (try_open_exec)// && !fake_pid_p) > exec_file_locate_attach (pid, 1); > > Effectively, the printf shows that with Valgrind gdbsrv, > fake_pid_p value is 1. > > When ignoring fake_pid_p, GDB can properly attach > to different Valgrind gdbsrv, and changes of executable > as expected. Ah, it seems I mailed a bad patch, my apologies! I was working on two fixes that touched the same line, and it looks like I rebased them in the wrong order. This updated patch has been created against the latest gdb/master (80fb91378c91a8239817a5ab2b1c3e346109db25). Could you please try your tests again? Thanks, Gary --- On attach, GDB will only attempt to determine the main executable's filename if one is not already set. This causes problems if you attach to one process and then attach to another: GDB will not attempt to discover the main executable on the second attach. If the two processes have different main executable files then the symbols will now be wrong. This is PR gdb/17626. In GDB some filenames are supplied by the user (e.g. using the "file" or "symbol-file" commands) and some are determined by GDB (e.g. while processing an "attach" command). This commit updates GDB to track which filenames were supplied by the user. When GDB might attempt to determine an executable filename and one is already set, filenames determined by GDB may be overridden but user-supplied filenames will not. gdb/ChangeLog: PR gdb/17626 * progspace.h (struct program_space) : New field. : Likewise. (symfile_objfile_is_user_supplied): New macro. * exec.h (exec_file_is_user_supplied): Likewise. * exec.c (exec_close): Clear exec_file_is_user_supplied. (exec_file_locate_attach): Remove get_exec_file check. Do not replace user-supplied executable or symbol files. Warn if user-supplied executable or symbol files do not match discovered file. (exec_file_command): Set exec_file_is_user_supplied. * symfile.c (symbol_file_clear): Clear symfile_objfile_is_user_supplied. (symbol_file_command): Set symfile_objfile_is_user_supplied. * inferior.c (add_inferior_command): Set exec_file_is_user_supplied and symfile_objfile_is_user_supplied. * main.c (captured_main): Likewise. * infcmd.c (attach_command_post_wait): Always call exec_file_locate_attach. Only call reopen_exec_file and reread_symbols if exec_file_is_user_supplied. * remote.c (remote_add_inferior): Remove get_exec_file check around exec_file_locate_attach. commit 9a3e9406df37eb937420653ae950677f907688ab Author: Jan Kratochvil Date: Wed Aug 12 18:05:44 2015 +0200 mainbuildid commit c035efd98527f99e03a0026bc780e70b25f976c4 Author: Jan Kratochvil Date: Wed Aug 12 18:05:44 2015 +0200 hexallocate commit e42869d96a302327ce96454c0d2145543c2dcd3c Author: Jan Kratochvil Date: Wed Aug 12 18:05:44 2015 +0200 locatetest commit fc064e4f050405c777709428fba9753f76e0ad67 Author: Jan Kratochvil Date: Sun Jul 12 20:59:03 2015 +0200 Tests for validate symbol file using build-id New testcase. gdb/testsuite/ChangeLog 2015-07-15 Aleksandar Ristovski Date: Wed Aug 12 18:05:43 2015 +0200 buildidwarn commit 35a6c7e8a3a06d0d4312ca0ac61f775908404539 Author: Jan Kratochvil Date: Wed Aug 12 18:05:43 2015 +0200 buildidsolibbfdopen commit 88db88f0eaa679a6003a0d937740aabd8645b9a1 Author: Jan Kratochvil Date: Wed Aug 12 18:05:43 2015 +0200 buildidverify commit abde5b2f068ead085a2a1a3dee9dd0d38fa804ea Author: Jan Kratochvil Date: Wed Aug 12 18:05:43 2015 +0200 buildidsolibsearch commit cdb53cfdd51ece48623559c9438781206c542cf6 Author: Jan Kratochvil Date: Wed Aug 12 18:05:43 2015 +0200 buildidtofile commit 131418d98260842d5c51faa491bd1f687b0cff1e Author: Jan Kratochvil Date: Wed Aug 12 18:05:42 2015 +0200 buildidproto commit 105855d3ed65660d3f6b757deb2715bf4c51f9fe Author: Jan Kratochvil Date: Wed Aug 12 18:05:42 2015 +0200 buildidtobfd commit a400763759a2134fb35b22fe16b905397d041df2 Author: Jan Kratochvil Date: Wed Aug 12 18:05:42 2015 +0200 buildidforcemove commit cecf494e5c91889b2e14f9de601f80a66f9f1f0c Author: Jan Kratochvil Date: Wed Aug 12 18:05:42 2015 +0200 buildidfreefix commit d3cfb809d3bf745a0ff88d8f859ec30d8c407a41 Author: Jan Kratochvil Date: Wed Aug 12 18:05:41 2015 +0200 openpsymfile commit 9306fee563612fbf22cfdd1ceaed88af5c5f0f9f Author: Jan Kratochvil Date: Wed Aug 12 18:05:41 2015 +0200 openpsolib commit cc174ddeed447e0f7c5c352b3955c7444f27c9c5 Author: Jan Kratochvil Date: Wed Aug 12 18:05:41 2015 +0200 openp commit cb971af740e27acf7c9bddbcf3cb6561eac6c212 Author: Jan Kratochvil Date: Wed Aug 12 18:05:41 2015 +0200 filelib commit 4e73026d7c026f25c550d587986b275964ce5af6 Author: Jan Kratochvil Date: Wed Aug 12 18:05:40 2015 +0200 openfromtargetdoclose commit 72b8f9888a26b0c219d5b833fcedffdd008b38ce Author: Jan Kratochvil Date: Wed Aug 12 18:05:40 2015 +0200 openfromtargetfd commit 7f8e7055a0c5a85ee69cd7e2afc5b94d04152b3e Author: Jan Kratochvil Date: Wed Aug 12 18:05:40 2015 +0200 openfromtarget commit 8f52371e0efe7ed06a907649d640ef477999a1fc Author: Jan Kratochvil Date: Wed Aug 12 18:05:40 2015 +0200 openpnullpathname commit 60aea42fb6c8444c1dfb8fd418bbe89c05f3eed3 Author: Jan Kratochvil Date: Wed Aug 12 18:05:39 2015 +0200 openpmode commit 49085cd8f6606199af381a7e71b90a0279ec9e34 Author: Jan Kratochvil Date: Wed Aug 12 18:05:39 2015 +0200 openppath commit 0eddadf0d2213ddafb0aa94da9fdef0c5c912d52 Author: Jan Kratochvil Date: Wed Aug 12 18:05:39 2015 +0200 openpenum commit d7c3003426921da562b581d161bf3eb736c11780 Author: Jan Kratochvil Date: Wed Aug 12 18:56:48 2015 +0200 sysrootdefault ----------------------------------------------------------------------- Summary of changes: gdb/main.c | 5 ++++- gdb/source.c | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) First 500 lines of diff: diff --git a/gdb/main.c b/gdb/main.c index ae2803c..2c63e80 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -548,7 +548,10 @@ captured_main (void *data) if (gdb_sysroot == NULL || *gdb_sysroot == '\0') { xfree (gdb_sysroot); - gdb_sysroot = xstrdup (TARGET_SYSROOT_PREFIX); + + /* Try first the local filesystem, + TARGET_SYSROOT_PREFIX is a fallback. */ + gdb_sysroot = xstrdup (":" TARGET_SYSROOT_PREFIX); } debug_file_directory = relocate_gdb_directory (DEBUGDIR, diff --git a/gdb/source.c b/gdb/source.c index 99706a2..3c35075 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1031,12 +1031,11 @@ openp_file (const char *path, enum openp_flags opts, const char *string, size_t if (!path) path = "."; - if ((opts & OPF_TRY_CWD_FIRST) || is_target_filename (string) - || IS_ABSOLUTE_PATH (string)) + if ((opts & OPF_TRY_CWD_FIRST) || IS_ABSOLUTE_PATH (string)) { int i; - if (is_target_filename (string) || is_regular_file (string)) + if (is_regular_file (string)) { filename = alloca (strlen (string) + 1); strcpy (filename, string); hooks/post-receive -- Repository for Project Archer.