From: Doug Evans <dje@google.com>
Date: Thu, 10 Dec 2015 20:00:31 +0000 (-0800)
Subject: patch ../102429533.patch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ccb4ed47ff9b703ca32f020f939b42c4d0ee355;p=thirdparty%2Fbinutils-gdb.git

patch ../102429533.patch
---

diff --git a/README.google b/README.google
index 04be03c3175..a593939bb1e 100644
--- a/README.google
+++ b/README.google
@@ -222,3 +222,11 @@ they are an ongoing maintenance burden.
 +
 +	testsuite/
 +	* gdb.python/py-objfile.exp: Add tests for objfile.have_debug_info.
+--- README.google	2015-09-05 18:13:45.000000000 -0700
++++ README.google	2015-09-05 18:20:10.000000000 -0700
++
++2015-09-05  Doug Evans  <google.com>
++
++	Ref: 15188412
++	* breakpoint.c (create_solib_event_breakpoint): Apply
++	gdbarch_skip_entrypoint if it's defined.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a3683d7c708..e53c3c72753 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7711,6 +7711,10 @@ create_solib_event_breakpoint_1 (struct gdbarch *gdbarch, CORE_ADDR address,
 {
   struct breakpoint *b;
 
+  /* GOOGLE LOCAL: Ref# 15188412.  */
+  if (gdbarch_skip_entrypoint_p (gdbarch))
+    address = gdbarch_skip_entrypoint (gdbarch, address);
+
   b = create_internal_breakpoint (gdbarch, address, bp_shlib_event,
 				  &internal_breakpoint_ops);
   update_global_location_list_nothrow (insert_mode);