base/dispatch.c: Fix list-macro invocation if we have `getauxval'.

[catacomb] / base / dispatch.c

diff --git a/base/dispatch.c b/base/dispatch.c
index 51619d5098679b3e7826bea6e39b8e2c565209ca..dfd0fbdaab7ac8c0a15df9b0bf3d2ae09cb59d62 100644 (file)
--- 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
@@ -320,8 +319,8 @@ static void probe_hwcaps(void)
   /* Shiny new libc lets us request individual entry types.  This is almost
    * too easy.
    */
-#  define CAP__GET(type, slot, ubranch)                                        \
-       probed.slot.ubranch = (AUXUTYPE_##ubranch)getauxval(type);
+#  define CAP__GET(type, ubranch, slot)                                        \
+       probed.slot = (AUXUTYPE_##ubranch)getauxval(type);
   WANTAUX(CAP__GET)
 #else
   /* Otherwise we're a bit stuck, really.  Modern Linux kernels make a copy