On Thu, Sep 2, 2021 at 9:17 AM Philippe Mathieu-Daudé <f4...@amsat.org>
wrote:
> Merge two TARGET_X86_64 consecutive blocks.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> target/i386/tcg/seg_helper.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
>
> diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c
> index 3ed20ca31d7..dee7bef68c6 100644
> --- a/target/i386/tcg/seg_helper.c
> +++ b/target/i386/tcg/seg_helper.c
> @@ -929,9 +929,7 @@ static void do_interrupt64(CPUX86State *env, int
> intno, int is_int,
> e2);
> env->eip = offset;
> }
> -#endif
>
> -#ifdef TARGET_X86_64
> void helper_sysret(CPUX86State *env, int dflag)
> {
> int cpl, selector;
> @@ -984,7 +982,7 @@ void helper_sysret(CPUX86State *env, int dflag)
> DESC_W_MASK | DESC_A_MASK);
> }
> }
> -#endif
> +#endif /* TARGET_X86_64 */
>
> /* real mode interrupt */
> static void do_interrupt_real(CPUX86State *env, int intno, int is_int,
> --
> 2.31.1
>
>
