From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-44744-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 10086 invoked by alias); 26 Jun 2006 22:28:10 -0000
Received: (qmail 10077 invoked by uid 22791); 26 Jun 2006 22:28:10 -0000
X-Spam-Check-By: sourceware.org
Received: from e32.co.us.ibm.com (HELO e32.co.us.ibm.com) (32.97.110.150)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 26 Jun 2006 22:28:08 +0000
Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com [9.17.195.11]) 	by e32.co.us.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id k5QMS6AN005041 	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) 	for <gdb-patches@sources.redhat.com>; Mon, 26 Jun 2006 18:28:06 -0400
Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) 	by westrelay02.boulder.ibm.com (8.13.6/NCO/VER7.0) with ESMTP id k5QMRZVF270818 	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) 	for <gdb-patches@sources.redhat.com>; Mon, 26 Jun 2006 16:27:36 -0600
Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) 	by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k5QMS5u1030765 	for <gdb-patches@sources.redhat.com>; Mon, 26 Jun 2006 16:28:06 -0600
Received: from dufur.beaverton.ibm.com (dufur.beaverton.ibm.com [9.47.22.20]) 	by d03av02.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id k5QMS4Qn030743; 	Mon, 26 Jun 2006 16:28:05 -0600
Subject: Re: [patch] Fixes problem setting breakpoint in dynamic loader
From: PAUL GILLIAM <pgilliam@us.ibm.com>
Reply-To: pgilliam@us.ibm.com
To: Mark Kettenis <mark.kettenis@xs4all.nl>
Cc: drow@false.org, gdb-patches@sources.redhat.com
In-Reply-To: <200606232148.k5NLm0Wx009049@elgar.sibelius.xs4all.nl>
References: <1148513171.315.104.camel@dufur.beaverton.ibm.com> 	 <20060525022635.GA15026@nevyn.them.org> 	 <1148593970.315.131.camel@dufur.beaverton.ibm.com> 	 <20060525225827.GA13498@nevyn.them.org> 	 <1148594987.315.137.camel@dufur.beaverton.ibm.com> 	 <1151094553.7608.89.camel@dufur.beaverton.ibm.com> 	 <200606232148.k5NLm0Wx009049@elgar.sibelius.xs4all.nl>
Content-Type: multipart/mixed; boundary="=-++grcdBuwpjfYNan5C18"
Date: Mon, 26 Jun 2006 22:28:00 -0000
Message-Id: <1151357021.7608.100.camel@dufur.beaverton.ibm.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.2 (2.2.2-5)
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2006-06/txt/msg00381.txt.bz2


--=-++grcdBuwpjfYNan5C18
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-length: 160

Here is the new patch, with out deleting the 'dot' symbol.  I included a
copy of the rs6000 patch as well, just for completeness.

OK to commit?

-=# Paul #=-


--=-++grcdBuwpjfYNan5C18
Content-Disposition: attachment; filename=loader_break.diff
Content-Type: text/x-patch; name=loader_break.diff; charset=utf-8
Content-Transfer-Encoding: 7bit
Content-length: 2675

2006-05-25  Paul Gilliam  <pgilliam@us.ibm.com

	* solib-svr4.c (enable_break): Resolve break address when the symbol
	is found in the data section.

Index: solib-svr4.c
===================================================================
RCS file: /cvs/src/src/gdb/solib-svr4.c,v
retrieving revision 1.58
diff -a -u -r1.58 solib-svr4.c
--- solib-svr4.c	18 May 2006 20:38:56 -0000	1.58
+++ solib-svr4.c	26 Jun 2006 22:08:43 -0000
@@ -1043,20 +1043,45 @@
       /* Now try to set a breakpoint in the dynamic linker.  */
       for (bkpt_namep = solib_break_names; *bkpt_namep != NULL; bkpt_namep++)
 	{
-          /* On ABI's that use function descriptors, there are usually
-             two linker symbols associated with each C function: one
-             pointing at the actual entry point of the machine code,
-             and one pointing at the function's descriptor.  The
-             latter symbol has the same name as the C function.
-
-             What we're looking for here is the machine code entry
-             point, so we are only interested in symbols in code
-             sections.  */
+	  /* What we're looking for here is the machine code entry point,
+	     so we are only interested in symbols in code sections.
+
+	     On ABI's that use function descriptors, the linker symbol with
+	     the same name as a C funtion points to that functions descriptor.
+	     When those function descriptors are in the code section, they
+	     contain executable code and we can set a breakpoint there. */
 	  sym_addr = bfd_lookup_symbol (tmp_bfd, *bkpt_namep, SEC_CODE);
 	  if (sym_addr != 0)
 	    break;
 	}
 
+      if (sym_addr == 0)
+        {
+	  CORE_ADDR sect_offset;
+	  
+	  /* No symbol was found in a code section, so look in the data
+             sections.  This will only happen when the linker symbol points
+	     to a function descriptor that is in a data section. */
+	  for (bkpt_namep = solib_break_names; *bkpt_namep!=NULL; bkpt_namep++)
+	    {
+	      /* On ABI's that use function descriptors that are in the data
+	         section, */
+	      sym_addr = bfd_lookup_symbol (tmp_bfd, *bkpt_namep, SEC_DATA);
+	      if (sym_addr != 0)
+		break;
+	    }
+	  if (sym_addr == 0)
+	    {
+	      target_close (tmp_bfd_target, 0);
+	      goto bkpt_at_symbol;
+	    }
+
+	  /* Convert 'sym_addr' from a function pointer to an address. */
+	  sym_addr = gdbarch_convert_from_func_ptr_addr (current_gdbarch,
+							 sym_addr,
+							 tmp_bfd_target);
+        }
+
       /* We're done with both the temporary bfd and target.  Remember,
          closing the target closes the underlying bfd.  */
       target_close (tmp_bfd_target, 0);

--=-++grcdBuwpjfYNan5C18--