[v3] single-binary: compile target/arm twice

[PATCH v3 16/33] target/arm/debug_helper: only include common helpers

Posted by Pierrick Bouvier 5 months, 2 weeks ago

Avoid pulling helper.h which contains TARGET_AARCH64.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 target/arm/debug_helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c
index 473ee2af38e..357bc2141ae 100644
--- a/target/arm/debug_helper.c
+++ b/target/arm/debug_helper.c
@@ -12,10 +12,12 @@
 #include "cpu-features.h"
 #include "cpregs.h"
 #include "exec/exec-all.h"
-#include "exec/helper-proto.h"
 #include "exec/watchpoint.h"
 #include "system/tcg.h"
 
+#define HELPER_H "tcg/helper.h"
+#include "exec/helper-proto.h.inc"
+
 #ifdef CONFIG_TCG
 /* Return the Exception Level targeted by debug exceptions. */
 static int arm_debug_target_el(CPUARMState *env)
-- 
2.47.2

Re: [PATCH v3 16/33] target/arm/debug_helper: only include common helpers

Posted by Richard Henderson 5 months, 2 weeks ago

On 4/30/25 23:23, Pierrick Bouvier wrote:
> Avoid pulling helper.h which contains TARGET_AARCH64.
> 
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   target/arm/debug_helper.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c
> index 473ee2af38e..357bc2141ae 100644
> --- a/target/arm/debug_helper.c
> +++ b/target/arm/debug_helper.c
> @@ -12,10 +12,12 @@
>   #include "cpu-features.h"
>   #include "cpregs.h"
>   #include "exec/exec-all.h"
> -#include "exec/helper-proto.h"
>   #include "exec/watchpoint.h"
>   #include "system/tcg.h"
>   
> +#define HELPER_H "tcg/helper.h"
> +#include "exec/helper-proto.h.inc"
> +
>   #ifdef CONFIG_TCG
>   /* Return the Exception Level targeted by debug exceptions. */
>   static int arm_debug_target_el(CPUARMState *env)

Oh, I see.

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

r~