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.

diff --git a/ChangeLog b/ChangeLog
index fc5ffd832dd82da2752a969ea9ab658c3dd43fcb..e813e563a1ed35ec2cab966df6a4900347bd3618 100644 (file)
--- 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 <ldsodefs.h>.
+       * sysdeps/nacl/ldsodefs.h (HAVE_AUX_VECTOR): Likewise.
 
 2016-04-09  Nick Alcock  <nick.alcock@oracle.com>
 

diff --git a/sysdeps/nacl/ldsodefs.h b/sysdeps/nacl/ldsodefs.h
index bc7723a36ec7f6154c6df8520cd63b7a4a794d98..c6307a64e7f59de5352ed28771bce818159897d3 100644 (file)
--- 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 <ldsodefs.h>
 
 /* 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 1f4d9e31d0d420ce7ef1e9c3cdfb045dc680181f..4c3676e20afe42aa44ec5107205903e3347368c8 100644 (file)
--- 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 <ldsodefs.h>
-
 /* We have the auxiliary vector.  */
 #define HAVE_AUX_VECTOR
 
+/* Get the real definitions.  */
+#include_next <ldsodefs.h>
+
 /* 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