diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/solib-svr4.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0fe15ef..0c75340 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-09-19 George Vasick <george.vasick@oracle.com> + + * solib-svr4.c (svr4_same_1): Also handle amd64 ld.so.1. + 2018-09-19 Stefan Teleman <stefan.teleman@oracle.com> April Chin <april.chin@oracle.com> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index bfef217..29df63f 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -153,8 +153,12 @@ svr4_same_1 (const char *gdb_so_name, const char *inferior_so_name) && strcmp (inferior_so_name, "/lib/ld.so.1") == 0) return 1; - /* Similarly, we observed the same issue with sparc64, but with + /* Similarly, we observed the same issue with amd64 and sparcv9, but with different locations. */ + if (strcmp (gdb_so_name, "/usr/lib/amd64/ld.so.1") == 0 + && strcmp (inferior_so_name, "/lib/amd64/ld.so.1") == 0) + return 1; + if (strcmp (gdb_so_name, "/usr/lib/sparcv9/ld.so.1") == 0 && strcmp (inferior_so_name, "/lib/sparcv9/ld.so.1") == 0) return 1; |