author | Stefan Teleman <stefan.teleman@oracle.com> |
Fri, 08 Nov 2013 08:16:59 -0800 | |
branch | s11-update |
changeset 2814 | dff3ca0071d6 |
parent 243 | 34b34302cac9 |
child 6420 | 65948e9e205b |
permissions | -rw-r--r-- |
2814
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
1 |
--- gdb-7.6/gdb/solib-svr4.c 2013-01-31 05:52:52.000000000 -0800 |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
2 |
+++ gdb-7.6/gdb/solib-svr4.c 2013-07-10 23:32:20.908310500 -0700 |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
3 |
@@ -125,6 +125,10 @@ |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
4 |
&& strcmp (inferior_so_name, "/lib/ld.so.1") == 0) |
243
34b34302cac9
7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff
changeset
|
5 |
return 1; |
2814
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
6 |
|
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
7 |
+ if (strcmp (gdb_so_name, "/usr/lib/amd64/ld.so.1") == 0 |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
8 |
+ && strcmp (inferior_so_name, "/lib/amd64/ld.so.1") == 0) |
243
34b34302cac9
7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff
changeset
|
9 |
+ return 1; |
2814
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
10 |
+ |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
11 |
/* Similarly, we observed the same issue with sparc64, but with |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
12 |
different locations. */ |
dff3ca0071d6
17086418 upgrade gdb to 7.6
Stefan Teleman <stefan.teleman@oracle.com>
parents:
243
diff
changeset
|
13 |
if (strcmp (gdb_so_name, "/usr/lib/sparcv9/ld.so.1") == 0 |