From f712f01fdfbdbfaed09181f4708d07c234a9631a Mon Sep 17 00:00:00 2001 From: Edjunior Barbosa Machado Date: Fri, 28 Sep 2012 20:20:08 +0000 Subject: [PATCH] 2012-09-28 Nathan Miller Edjunior Machado PR gdb/13989 * solib.c (solib_find): Prevent GDB from loading native libraries when debugging a cross-target corefile. --- gdb/ChangeLog | 7 +++++++ gdb/solib.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 528c276b39..b5aeda17f0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-09-28 Nathan Miller + Edjunior Machado + + PR gdb/13989 + * solib.c (solib_find): Prevent GDB from loading native libraries when + debugging a cross-target corefile. + 2012-09-28 selven Make definition match declaration. diff --git a/gdb/solib.c b/gdb/solib.c index 01573f8718..d795678e7f 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -300,11 +300,6 @@ solib_find (char *in_pathname, int *fd) if (found_file < 0) temp_pathname = NULL; - /* If not found, search the solib_search_path (if any). */ - if (found_file < 0 && solib_search_path != NULL) - found_file = openp (solib_search_path, OPF_TRY_CWD_FIRST, - in_pathname, O_RDONLY | O_BINARY, &temp_pathname); - /* If the search in gdb_sysroot failed, and the path name is absolute at this point, make it relative. (openp will try and open the file according to its absolute path otherwise, which is not what we want.)