about summary refs log tree commit diff
path: root/sysdeps/generic/dl-sysdep.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-12-12 04:32:41 +0000
committerUlrich Drepper <drepper@redhat.com>2003-12-12 04:32:41 +0000
commit8e4f5035e37bed96fbfa530e3fa8ae8d9bc631cf (patch)
tree3eef59b07cbdc428a199beb0d34c4c6f6510b876 /sysdeps/generic/dl-sysdep.c
parent1ce9631b86cbc5ae3104561f37bf7ea22f8c437c (diff)
downloadglibc-8e4f5035e37bed96fbfa530e3fa8ae8d9bc631cf.tar.gz
glibc-8e4f5035e37bed96fbfa530e3fa8ae8d9bc631cf.tar.xz
glibc-8e4f5035e37bed96fbfa530e3fa8ae8d9bc631cf.zip
Update.
2003-12-11  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/kernel-features.h: Remove __ASSUME_VSYSCALL.
	There might always be processes which have no vDSO.
	* sysdeps/generic/dl-sysdep.c: Remove __ASSUME_VSYSCALL uses.
	* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
Diffstat (limited to 'sysdeps/generic/dl-sysdep.c')
-rw-r--r--sysdeps/generic/dl-sysdep.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 40dcf8060e..53b9ea233c 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -97,7 +97,7 @@ _dl_sysdep_start (void **start_argptr,
 #  define set_seen(tag) seen |= M ((tag)->a_type)
 # endif
 #endif
-#if defined NEED_DL_SYSINFO && !defined __ASSUME_VSYSCALL
+#ifdef NEED_DL_SYSINFO
   ElfW(Word) new_sysinfo = 0;
 #endif
 
@@ -158,11 +158,7 @@ _dl_sysdep_start (void **start_argptr,
 	break;
 #ifdef NEED_DL_SYSINFO
       case AT_SYSINFO:
-# ifndef __ASSUME_VSYSCALL
 	new_sysinfo = av->a_un.a_val;
-# else
-	GL(dl_sysinfo) = av->a_un.a_val;
-# endif
 	break;
       case AT_SYSINFO_EHDR:
 	GL(dl_sysinfo_dso) = av->a_un.a_ptr;
@@ -202,7 +198,7 @@ _dl_sysdep_start (void **start_argptr,
     GL(dl_pagesize) = __getpagesize ();
 #endif
 
-#if defined NEED_DL_SYSINFO && !defined __ASSUME_VSYSCALL
+#if defined NEED_DL_SYSINFO
   /* Only set the sysinfo value if we also have the vsyscall DSO.  */
   if (GL(dl_sysinfo_dso) != 0)
     GL(dl_sysinfo) = new_sysinfo;