Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gdb/patches/gdb.solib-svr4.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 243 34b34302cac9
child 1511 4d3b0b480760
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
243
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     1
 
--- gdb-6.8/gdb/solib-svr4.c.orig	Fri Jul 10 12:25:23 2009
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     2
 
+++ gdb-6.8/gdb/solib-svr4.c	Fri Jul 10 12:25:34 2009
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     3
 
@@ -1649,6 +1649,12 @@
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     4
 
   if (strcmp (gdb->so_original_name, "/usr/lib/ld.so.1") == 0
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     5
 
       && strcmp (inferior->so_original_name, "/lib/ld.so.1") == 0)
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     6
 
     return 1;
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     7
 
+  if (strcmp (gdb->so_original_name, "/usr/lib/amd64/ld.so.1") == 0
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     8
 
+      && strcmp (inferior->so_original_name, "/lib/amd64/ld.so.1") == 0)
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
     9
 
+    return 1;
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
    10
 
+  if (strcmp (gdb->so_original_name, "/usr/lib/sparcv9/ld.so.1") == 0
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
    11
 
+      && strcmp (inferior->so_original_name, "/lib/sparcv9/ld.so.1") == 0)
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
    12
 
+    return 1;
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
    13
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
    14
 
   return 0;
34b34302cac9 7039303 Move gdb 6.8 from SFW to Userland.
George Vasick <george.vasick@oracle.com>
parents:
diff changeset 
    15
 
 }
upstream/oracle/userland-gate