OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert basenames_may_differ patch

Browse Source 
Commit a0c1ffedc regressed certain cases coming from Eclipse.
See PR breakpoints/24915.

gdb/ChangeLog
2020-02-07  Tom Tromey  <tromey@adacore.com>

	PR breakpoints/24915:
	* source.c (find_and_open_source): Do not check basenames_may_differ.

gdb/testsuite/ChangeLog
2020-02-07  Tom Tromey  <tromey@adacore.com>

	PR breakpoints/24915:
	* gdb.base/annotate-symlink.exp: Use setup_xfail.

Change-Id: Iadbf42f35eb40c95ad32b2108ae25d8f199998bd
This commit is contained in:
Tom Tromey 2020-02-05 10:53:44 +01:00
parent 6e56965616
commit 5abbbe1d13
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-02-07 Tom Tromey <tromey@adacore.com>
PR breakpoints/24915:
* source.c (find_and_open_source): Do not check basenames_may_differ.
2020-02-07 Tom Tromey <tom@tromey.com> 2020-02-07 Tom Tromey <tom@tromey.com>
* README: Update gdbserver documentation. * README: Update gdbserver documentation.

19
gdb/source.c
View File

@ -1051,10 +1051,7 @@ find_and_open_source (const char *filename,
result = gdb_open_cloexec (fullname->get (), OPEN_MODE, 0); result = gdb_open_cloexec (fullname->get (), OPEN_MODE, 0);
if (result >= 0) if (result >= 0)
{ {
if (basenames_may_differ) *fullname = gdb_realpath (fullname->get ());
*fullname = gdb_realpath (fullname->get ());
else
*fullname = gdb_abspath (fullname->get ());
return scoped_fd (result); return scoped_fd (result);
} }
@ -1098,12 +1095,9 @@ find_and_open_source (const char *filename,
if (rewritten_filename != NULL) if (rewritten_filename != NULL)
filename = rewritten_filename.get (); filename = rewritten_filename.get ();
openp_flags flags = OPF_SEARCH_IN_PATH;
if (basenames_may_differ)
flags |= OPF_RETURN_REALPATH;
/* Try to locate file using filename. */ /* Try to locate file using filename. */
result = openp (path, flags, filename, OPEN_MODE, fullname); result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH, filename,
OPEN_MODE, fullname);
if (result < 0 && dirname != NULL) if (result < 0 && dirname != NULL)
{ {
/* Remove characters from the start of PATH that we don't need when /* Remove characters from the start of PATH that we don't need when
@ -1124,15 +1118,16 @@ find_and_open_source (const char *filename,
cdir_filename.append (SLASH_STRING); cdir_filename.append (SLASH_STRING);
cdir_filename.append (filename_start); cdir_filename.append (filename_start);
result = openp (path, flags, cdir_filename.c_str (), OPEN_MODE, result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH,
fullname); cdir_filename.c_str (), OPEN_MODE, fullname);
} }
if (result < 0) if (result < 0)
{ {
/* Didn't work. Try using just the basename. */ /* Didn't work. Try using just the basename. */
p = lbasename (filename); p = lbasename (filename);
if (p != filename) if (p != filename)
result = openp (path, flags, p, OPEN_MODE, fullname); result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH, p,
OPEN_MODE, fullname);
} }
return scoped_fd (result); return scoped_fd (result);

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-02-07 Tom Tromey <tromey@adacore.com>
PR breakpoints/24915:
* gdb.base/annotate-symlink.exp: Use setup_xfail.
2020-02-06 Shahab Vahedi <shahab@synopsys.com> 2020-02-06 Shahab Vahedi <shahab@synopsys.com>
* gdb.tui/tui-missing-src.exp: Add the "missing source * gdb.tui/tui-missing-src.exp: Add the "missing source

3
gdb/testsuite/gdb.base/annotate-symlink.exp
View File

@ -47,5 +47,8 @@ gdb_breakpoint func message
gdb_test_no_output "set annotate 1" gdb_test_no_output "set annotate 1"
# The patch to cause this output was reverted.
# See PR breakpoints/24915.
setup_xfail *-*-* 24915
gdb_test "continue" \ gdb_test "continue" \
"Breakpoint .* func .*realname-expand-link.c:$decimal\r\n\032\032.*realname-expand-link.c:.*" "Breakpoint .* func .*realname-expand-link.c:$decimal\r\n\032\032.*realname-expand-link.c:.*"