[Glibc-bsd-commits] r3608 - trunk/glibc-ports/kfreebsd

[Robert Millan]

Author: rmh
Date: 2011-07-17 13:23:43 +0000 (Sun, 17 Jul 2011)
New Revision: 3608

Modified:
   trunk/glibc-ports/kfreebsd/dl-sysdep.c
Log:
Remove HAVE_AUX_SECURE checks, they're ment for a Linux-specific ELF note (AT_SECURE)

Modified: trunk/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-sysdep.c	2011-07-17 13:15:16 UTC (rev 3607)
+++ trunk/glibc-ports/kfreebsd/dl-sysdep.c	2011-07-17 13:23:43 UTC (rev 3608)
@@ -45,21 +45,15 @@
   ElfW(Word) phnum = 0;
   ElfW(Addr) user_entry;
   ElfW(auxv_t) *av;
-#ifdef HAVE_AUX_SECURE
-# define set_seen(tag) (tag)	/* Evaluate for the side effects.  */
-# define set_seen_secure() ((void) 0)
-#else
   uid_t uid = 0;
   gid_t gid = 0;
   unsigned int seen = 0;
-# define set_seen_secure() (seen = -1)
 # ifdef HAVE_AUX_XID
 #  define set_seen(tag) (tag)	/* Evaluate for the side effects.  */
 # else
 #  define M(type) (1 << (type))
 #  define set_seen(tag) seen |= M ((tag)->a_type)
 # endif
-#endif
 #ifdef NEED_DL_SYSINFO
   uintptr_t new_sysinfo = 0;
 #endif
@@ -91,7 +85,6 @@
 	_dl_base_addr = av->a_un.a_val;
 	break;
 #endif
-#ifndef HAVE_AUX_SECURE
 #ifndef __powerpc__
 	/* For some odd reason these are not in sys/powerpc/include/elf.h.  */
       case AT_UID:
@@ -103,10 +96,8 @@
 	gid ^= av->a_un.a_val;
 	break;
 #endif
-#endif
       }
 
-#ifndef HAVE_AUX_SECURE
   if (seen != -1)
     {
       /* Fill in the values we have not gotten from the kernel through the
@@ -124,7 +115,6 @@
 	 or setgid run.  */
       INTUSE(__libc_enable_secure) = uid | gid;
     }
-#endif
 
 #ifndef HAVE_AUX_PAGESIZE
   if (GLRO(dl_pagesize) == 0)