[PATCH v5 42/48] target/arm/tcg/hflags: compile file twice (system, user)

[Pierrick Bouvier]

Signed-off-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
---
 target/arm/tcg/hflags.c    | 4 +++-
 target/arm/tcg/meson.build | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c
index e51d9f7b159..9fdc18d5ccb 100644
--- a/target/arm/tcg/hflags.c
+++ b/target/arm/tcg/hflags.c
@@ -9,9 +9,11 @@
 #include "cpu.h"
 #include "internals.h"
 #include "cpu-features.h"
-#include "exec/helper-proto.h"
 #include "cpregs.h"
 
+#define HELPER_H "tcg/helper.h"
+#include "exec/helper-proto.h.inc"
+
 static inline bool fgt_svc(CPUARMState *env, int el)
 {
     /*
diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build
index e3be0eb22b2..8623152a645 100644
--- a/target/arm/tcg/meson.build
+++ b/target/arm/tcg/meson.build
@@ -30,7 +30,6 @@ arm_ss.add(files(
   'translate-mve.c',
   'translate-neon.c',
   'translate-vfp.c',
-  'hflags.c',
   'iwmmxt_helper.c',
   'm_helper.c',
   'mve_helper.c',
@@ -65,7 +64,9 @@ arm_user_ss.add(when: 'TARGET_AARCH64', if_false: 
files('cpu-v7m.c'))
 
 arm_common_system_ss.add(files(
   'crypto_helper.c',
+  'hflags.c',
 ))
 arm_user_ss.add(files(
   'crypto_helper.c',
+  'hflags.c',
 ))
-- 
2.47.2