Patch for rtld.c

Patch for rtld.c

[Andreas Jaeger]

I've read today through rtld.c and noticed that we have a check for
_dl_rtld_map.l_opencount > 0 in dl_main but initialize it to 1. 

Looking closer together with Andreas Schwab, he found that the
following change changed one place where l_opencount was incremented
- but this place was forgotten:

1998-05-03  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/rtld.c (dl_main): Fix check for number of references to
	interpreter object.

I'm appending a patch to fix this (l_opencount == 1 means there's no
explicit ref).

Andreas

2000-02-14  Andreas Jaeger  <aj@suse.de>

	* elf/rtld.c (dl_main): Fix check for references to dynamic
	linker.


Index: elf/rtld.c
*** rtld.c	1999/08/19 23:17:32	1.154
--- rtld.c	2000/02/14 15:35:29
***************
*** 1041,1047 ****
        /* We must prepare the profiling.  */
        _dl_start_profile (_dl_profile_map, _dl_profile_output);
  
!     if (_dl_rtld_map.l_opencount > 0)
        {
  	/* There was an explicit ref to the dynamic linker as a shared lib.
  	   Re-relocate ourselves with user-controlled symbol definitions.  */
--- 1041,1047 ----
        /* We must prepare the profiling.  */
        _dl_start_profile (_dl_profile_map, _dl_profile_output);
  
!     if (_dl_rtld_map.l_opencount > 1)
        {
  	/* There was an explicit ref to the dynamic linker as a shared lib.
  	   Re-relocate ourselves with user-controlled symbol definitions.  */

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de

Re: Patch for rtld.c

[Ulrich Drepper]

Andreas Jaeger <aj@suse.de> writes:

> I've read today through rtld.c and noticed that we have a check for
> _dl_rtld_map.l_opencount > 0 in dl_main but initialize it to 1. 

Makes sense.  I've checked in the change.  What was it that made you
look for this?

-- 
---------------.      drepper at gnu.org  ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Red Hat          `--' drepper at redhat.com   `------------------------

Re: Patch for rtld.c

[Andreas Jaeger]

>>>>> Ulrich Drepper writes:

Uli> Andreas Jaeger <aj@suse.de> writes:
>> I've read today through rtld.c and noticed that we have a check for
>> _dl_rtld_map.l_opencount > 0 in dl_main but initialize it to 1. 

Uli> Makes sense.  I've checked in the change.  What was it that made you
Uli> look for this?

Trying to understand the dynamic linker to make it work properly for
Linux/MIPS (I get a segfault during this relocation call - need to
check it some time).

Andreas
-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de