From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 5 Feb 2021 14:03:32 +0000 (+0100)
Subject: cpu: Only include <sys/auxv.h> if available
X-Git-Tag: v7.1.0-rc1~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82ffb81c9cafbcdf7b1f56f9644883fe8398faa5;p=thirdparty%2Flibvirt.git

cpu: Only include <sys/auxv.h> if available

This header is not present on several non-Linux targets that
nonetheless support aarch64.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/meson.build b/meson.build
index 095d6ca664..766bc06b61 100644
--- a/meson.build
+++ b/meson.build
@@ -690,6 +690,7 @@ headers = [
   'net/if.h',
   'pty.h',
   'pwd.h',
+  'sys/auxv.h',
   'sys/ioctl.h',
   'sys/mount.h',
   'sys/syscall.h',
diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 6ba5bf0724..aa3e5d8980 100644
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -25,7 +25,9 @@
 # if defined(WITH_ASM_HWCAP_H)
 #  include <asm/hwcap.h>
 # endif
-# include <sys/auxv.h>
+# if defined(WITH_SYS_AUXV_H)
+#  include <sys/auxv.h>
+# endif
 #endif
 
 #include "viralloc.h"