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

diff --git a/target/arm/tcg/arith_helper.c b/target/arm/tcg/arith_helper.c
index 9a555c7966c..bc3c78c5011 100644
--- a/target/arm/tcg/arith_helper.c
+++ b/target/arm/tcg/arith_helper.c
@@ -7,10 +7,12 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/helper-proto.h"
 #include "qemu/crc32c.h"
 #include <zlib.h> /* for crc32 */
 
+#define HELPER_H "tcg/helper.h"
+#include "exec/helper-proto.h.inc"
+
 /*
  * Note that signed overflow is undefined in C.  The following routines are
  * careful to use unsigned types where modulo arithmetic is required.
diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build
index a5fcf0e7b88..ad306f73eff 100644
--- a/target/arm/tcg/meson.build
+++ b/target/arm/tcg/meson.build
@@ -34,7 +34,6 @@ arm_ss.add(files(
   'mve_helper.c',
   'op_helper.c',
   'vec_helper.c',
-  'arith_helper.c',
   'vfp_helper.c',
 ))
 
@@ -59,6 +58,7 @@ arm_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c'))
 arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c'))
 
 arm_common_system_ss.add(files(
+  'arith_helper.c',
   'crypto_helper.c',
   'hflags.c',
   'iwmmxt_helper.c',
@@ -67,6 +67,7 @@ arm_common_system_ss.add(files(
   'tlb-insns.c',
 ))
 arm_user_ss.add(files(
+  'arith_helper.c',
   'crypto_helper.c',
   'hflags.c',
   'iwmmxt_helper.c',
-- 
2.47.2

On 5/4/25 18:52, Pierrick Bouvier wrote:
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   target/arm/tcg/arith_helper.c | 4 +++-
>   target/arm/tcg/meson.build    | 3 ++-
>   2 files changed, 5 insertions(+), 2 deletions(-)

This one doesn't use CPUARMState, so we can probably drop the cpu.h include, and thus 
always build once.

r~

On 5/5/25 11:54 AM, Richard Henderson wrote:
> On 5/4/25 18:52, Pierrick Bouvier wrote:
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>>    target/arm/tcg/arith_helper.c | 4 +++-
>>    target/arm/tcg/meson.build    | 3 ++-
>>    2 files changed, 5 insertions(+), 2 deletions(-)
> 
> This one doesn't use CPUARMState, so we can probably drop the cpu.h include, and thus
> always build once.
>

Done.

> r~

On 5/5/25 12:33, Pierrick Bouvier wrote:
> On 5/5/25 11:54 AM, Richard Henderson wrote:
>> On 5/4/25 18:52, Pierrick Bouvier wrote:
>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>> ---
>>>    target/arm/tcg/arith_helper.c | 4 +++-
>>>    target/arm/tcg/meson.build    | 3 ++-
>>>    2 files changed, 5 insertions(+), 2 deletions(-)
>>
>> This one doesn't use CPUARMState, so we can probably drop the cpu.h include, and thus
>> always build once.
>>
> 
> Done.

Thanks.  Preemptive

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~