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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 13:47:19 +0000 (Tue, 20 Oct 2015)
New Revision: 5793

Modified:
   trunk/glibc-ports/kfreebsd/dl-sysdep.c
Log:
Merge from upstream:

commit 6bc6bd3b10e6c2fd4c656647aa643919b0519825
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Fri Oct 10 11:13:11 2014 +0000

    Don't use INTVARDEF/INTUSE with __libc_enable_secure (bug 14132).
    
    Continuing the removal of the obsolete INTDEF / INTVARDEF / INTUSE
    mechanism, this patch replaces its use for __libc_enable_secure with
    the use of rtld_hidden_data_def and rtld_hidden_proto.



Modified: trunk/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-sysdep.c	2015-10-20 13:15:35 UTC (rev 5792)
+++ trunk/glibc-ports/kfreebsd/dl-sysdep.c	2015-10-20 13:47:19 UTC (rev 5793)
@@ -56,7 +56,7 @@
 ElfW(Addr) _dl_base_addr;
 #endif
 int __libc_enable_secure attribute_relro = 0;
-INTVARDEF(__libc_enable_secure)
+rtld_hidden_data_def (__libc_enable_secure)
 int __libc_multiple_libcs = 0;	/* Defining this here avoids the inclusion
 				   of init-first.  */
 /* This variable contains the lowest stack address ever used.  */
@@ -100,7 +100,7 @@
 #endif
 
   __libc_stack_end = DL_STACK_END (start_argptr);
-  DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ,
+  DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ,
 			  GLRO(dl_auxv));
 
   user_entry = (ElfW(Addr)) ENTRY_POINT;
@@ -144,7 +144,7 @@
 
       /* If one of the two pairs of IDs does not match this is a setuid
 	 or setgid run.  */
-      INTUSE(__libc_enable_secure) = uid | gid;
+      __libc_enable_secure = uid | gid;
     }
 
 #ifndef HAVE_AUX_PAGESIZE
@@ -182,7 +182,7 @@
   /* If this is a SUID program we make sure that FDs 0, 1, and 2 are
      allocated.  If necessary we are doing it ourself.  If it is not
      possible we stop the program.  */
-  if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
+  if (__builtin_expect (__libc_enable_secure, 0))
     __libc_check_standard_fds ();
 
   (*dl_main) (phdr, phnum, &user_entry, GLRO(dl_auxv));