From a0e9bb8a70bf2ac9ddb7d1f638ce6af2c80d13e7 Mon Sep 17 00:00:00 2001
Message-Id: <a0e9bb8a70bf2ac9ddb7d1f638ce6af2c80d13e7.1716364654.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 26 May 2016 09:26:09 +0100
Subject: [PATCH] base/dispatch.c: Just include all the auxvec-related headers
 we can.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

The necessary stuff will be in one of them.  It turns out that the
previous approach sometimes missed some important definitions.
---
 base/dispatch.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/base/dispatch.c b/base/dispatch.c
index 51619d50..63649748 100644
--- a/base/dispatch.c
+++ b/base/dispatch.c
@@ -205,13 +205,12 @@ static int xmm_registers_available_p(void)
 /* Try to find the system's definitions for auxiliary vector entries. */
 #ifdef HAVE_SYS_AUXV_H
 #  include <sys/auxv.h>
-#else
-#  ifdef HAVE_LINUX_AUXVEC_H
-#    include <linux/auxvec.h>
-#  endif
-#  ifdef HAVE_ASM_HWCAP_H
-#    include <asm/hwcap.h>
-#  endif
+#endif
+#ifdef HAVE_LINUX_AUXVEC_H
+#  include <linux/auxvec.h>
+#endif
+#ifdef HAVE_ASM_HWCAP_H
+#  include <asm/hwcap.h>
 #endif
 
 /* The type of entries in the auxiliary vector.  I'm assuming that `unsigned
-- 
[mdw]