[Glibc-bsd-commits] r6015 - in trunk: glibc-ports/kfreebsd glibc-ports-2.23/kfreebsd

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-04-20 18:09:46 +0000 (Wed, 20 Apr 2016)
New Revision: 6015

Modified:
   trunk/glibc-ports-2.23/kfreebsd/ldsodefs.h
   trunk/glibc-ports/kfreebsd/ldsodefs.h
Log:
Merge from upstream:

commit e1ef505659e9720ebdb116a21e91e0398cd411e5
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Mon Apr 11 10:27:02 2016 +0200

    Fix build with HAVE_AUX_VECTOR
    
        * sysdeps/unix/sysv/linux/ldsodefs.h (HAVE_AUX_VECTOR): Define before
        including <ldsodefs.h>.
        * sysdeps/nacl/ldsodefs.h (HAVE_AUX_VECTOR): Likewise.



Modified: trunk/glibc-ports/kfreebsd/ldsodefs.h
===================================================================
--- trunk/glibc-ports/kfreebsd/ldsodefs.h	2016-04-19 00:23:00 UTC (rev 6014)
+++ trunk/glibc-ports/kfreebsd/ldsodefs.h	2016-04-20 18:09:46 UTC (rev 6015)
@@ -19,17 +19,15 @@
 
 #ifndef	_LDSODEFS_H
 
-/* Get the real definitions.  */
-#include_next <ldsodefs.h>
-
-/* Now define our stuff.  */
-
 /* FreeBSD puts some extra information into an auxiliary vector when it
    execs ELF executables.  Note that it uses AT_* values of 10 and 11
    to denote something different than AT_NOTELF and AT_UID, but this is
    not a problem since elf/dl-support.c ignores these AT_* values.  */
 #define HAVE_AUX_VECTOR
 
+/* Get the real definitions.  */
+#include_next <ldsodefs.h>
+
 /* Used by static binaries to check the auxiliary vector.  */
 extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function;
 

Modified: trunk/glibc-ports-2.23/kfreebsd/ldsodefs.h
===================================================================
--- trunk/glibc-ports-2.23/kfreebsd/ldsodefs.h	2016-04-19 00:23:00 UTC (rev 6014)
+++ trunk/glibc-ports-2.23/kfreebsd/ldsodefs.h	2016-04-20 18:09:46 UTC (rev 6015)
@@ -19,17 +19,15 @@
 
 #ifndef	_LDSODEFS_H
 
-/* Get the real definitions.  */
-#include_next <ldsodefs.h>
-
-/* Now define our stuff.  */
-
 /* FreeBSD puts some extra information into an auxiliary vector when it
    execs ELF executables.  Note that it uses AT_* values of 10 and 11
    to denote something different than AT_NOTELF and AT_UID, but this is
    not a problem since elf/dl-support.c ignores these AT_* values.  */
 #define HAVE_AUX_VECTOR
 
+/* Get the real definitions.  */
+#include_next <ldsodefs.h>
+
 /* Used by static binaries to check the auxiliary vector.  */
 extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function;