Re: [PATCH] dl-sysdep missing symbols

[Jakub Jelinek <jakub at redhat dot com>]

On Wed, Jul 02, 2003 at 09:58:08AM -0500, Steven Munroe wrote:
> todays cvs head build fails for PPC64
> 
> ../sysdeps/generic/dl-sysdep.c:198: error: structure has no member named
> `_dl_sysinfo_dso'
> ../sysdeps/generic/dl-sysdep.c:199: error: structure has no member named
> `_dl_sysinfo'
> 
> The problem seems that PPC/PPC64 does not need dl_sysinfo and does NOT
> __ASSUME_VSYSCALL. So the #ifndef in generic/dl-sysdep.c (see below) is
> inverted (should be #ifdef).
> 
> #ifndef __ASSUME_VSYSCALL
>   /* Only set the sysinfo value if we also have the vsyscall DSO.  */
>   if (GL(dl_sysinfo_dso) != 0)
>     GL(dl_sysinfo) = new_sysinfo;
> #endif
> 
> So the attached patch inverts the __ASSUME_VSYSCALL conditional and compiles
> correctly.

On ppc, that is. #ifndef __ASSUME_VSYSCALL is correct there, just it needs
to be protected with NEED_DL_SYSINFO as well. With your patch i686 with
--enable-kernel for very recent kernels would not compile at all and when
__ASSUME_VSYSCALL was not defined, it would just never use vDSO.

2003-07-02  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Protect new_sysinfo
	decl and use with #ifdef NEED_DL_SYSINFO.

--- libc/sysdeps/generic/dl-sysdep.c.jj	2003-07-02 12:31:02.000000000 -0400
+++ libc/sysdeps/generic/dl-sysdep.c	2003-07-02 12:32:36.000000000 -0400
@@ -93,7 +93,7 @@ _dl_sysdep_start (void **start_argptr,
 #  define set_seen(tag) seen |= M ((tag)->a_type)
 # endif
 #endif
-#ifndef __ASSUME_VSYSCALL
+#if defined NEED_DL_SYSINFO && !defined __ASSUME_VSYSCALL
   ElfW(Word) new_sysinfo = 0;
 #endif
 
@@ -193,7 +193,7 @@ _dl_sysdep_start (void **start_argptr,
     GL(dl_pagesize) = __getpagesize ();
 #endif
 
-#ifndef __ASSUME_VSYSCALL
+#if defined NEED_DL_SYSINFO && !defined __ASSUME_VSYSCALL
   /* Only set the sysinfo value if we also have the vsyscall DSO.  */
   if (GL(dl_sysinfo_dso) != 0)
     GL(dl_sysinfo) = new_sysinfo;


	Jakub