On 6/4/21 8:52 AM, Alex Bennée wrote:
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 3edf8bb4ec..e9bfb6f575 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -223,7 +223,8 @@ typedef struct ARMPACKey {
} ARMPACKey;
#else
static inline void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) { }
-#endif
+
+#endif /* TARGET_AARCH64 */
/* See the commentary above the TBFLAG field definitions. */
typedef struct CPUARMTBFlags {
Unrelated change.
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index b297d0e6aa..0e41854b92 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -23,7 +23,11 @@
#include "target/arm/idau.h"
#include "qapi/error.h"
#include "cpu.h"
+
+#ifdef TARGET_AARCH64
#include "cpu-sve.h"
+#endif /* TARGET_AARCH64 */
+
Unrelated change and unnecessary.
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index edc4b4cb4e..984dae7643 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -18,6 +18,10 @@
#include "cpregs.h"
#include "tcg-cpu.h"
+#ifdef TARGET_AARCH64
+#include "cpu-sve.h"
+#endif /* TARGET_AARCH64 */
Are the ifdefs really necessary?
r~