From e1ef505659e9720ebdb116a21e91e0398cd411e5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 11 Apr 2016 10:27:02 +0200 Subject: Fix build with HAVE_AUX_VECTOR * sysdeps/unix/sysv/linux/ldsodefs.h (HAVE_AUX_VECTOR): Define before including . * sysdeps/nacl/ldsodefs.h (HAVE_AUX_VECTOR): Likewise. --- ChangeLog | 3 +++ sysdeps/nacl/ldsodefs.h | 6 +++--- sysdeps/unix/sysv/linux/ldsodefs.h | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc5ffd832d..e813e563a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ [!HAVE_AUX_VECTOR]: Do not define _dl_auxv field. * misc/getauxval.c (__getauxval) [!HAVE_AUX_VECTOR]: Do not go through GLRO(dl_auxv) list. + * sysdeps/unix/sysv/linux/ldsodefs.h (HAVE_AUX_VECTOR): Define before + including . + * sysdeps/nacl/ldsodefs.h (HAVE_AUX_VECTOR): Likewise. 2016-04-09 Nick Alcock diff --git a/sysdeps/nacl/ldsodefs.h b/sysdeps/nacl/ldsodefs.h index bc7723a36e..c6307a64e7 100644 --- a/sysdeps/nacl/ldsodefs.h +++ b/sysdeps/nacl/ldsodefs.h @@ -18,14 +18,14 @@ #ifndef _LDSODEFS_H +/* We have the auxiliary vector. */ +#define HAVE_AUX_VECTOR 1 + /* Get the real definitions. */ #include_next /* Now define our stuff. */ -/* We have the auxiliary vector. */ -#define HAVE_AUX_VECTOR 1 - /* Used by static binaries to check the auxiliary vector. */ extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function; diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h index 1f4d9e31d0..4c3676e20a 100644 --- a/sysdeps/unix/sysv/linux/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/ldsodefs.h @@ -18,12 +18,12 @@ #ifndef _LDSODEFS_H -/* Get the real definitions. */ -#include_next - /* We have the auxiliary vector. */ #define HAVE_AUX_VECTOR +/* Get the real definitions. */ +#include_next + /* We can assume that the kernel always provides the AT_UID, AT_EUID, AT_GID, and AT_EGID values in the auxiliary vector from 2.4.0 or so on. */ #define HAVE_AUX_XID -- cgit 1.4.1