diff mbox

tcg: Fix tci build

Message ID 1505175459-27177-1-git-send-email-jincheng.miao@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

jincheng.miao@gmail.com Sept. 12, 2017, 12:17 a.m. UTC
From: Jincheng Miao <jincheng.miao@gmail.com>

The previous commit 659ef5cbb8 enable LDST_LABELS in tci target,
but which causes tci build error like:
tcg/tcg.c:116:13: error: ‘tcg_out_ldst_finalize’ used but never defined [-Werror]
 static bool tcg_out_ldst_finalize(TCGContext *s);
             ^
cc1: all warnings being treated as errors
make[1]: *** [tcg/tcg.o] Error 1
make: *** [subdir-x86_64-softmmu] Error 2

If this macro is not used in tci, we could just delete it.

Signed-off-by: Jincheng Miao <jincheng.miao@gmail.com>
---
 tcg/tci/tcg-target.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

Alistair Francis Sept. 11, 2017, 5:29 p.m. UTC | #1
On Mon, Sep 11, 2017 at 5:17 PM,  <jincheng.miao@gmail.com> wrote:
> From: Jincheng Miao <jincheng.miao@gmail.com>
>
> The previous commit 659ef5cbb8 enable LDST_LABELS in tci target,
> but which causes tci build error like:
> tcg/tcg.c:116:13: error: ‘tcg_out_ldst_finalize’ used but never defined [-Werror]
>  static bool tcg_out_ldst_finalize(TCGContext *s);
>              ^
> cc1: all warnings being treated as errors
> make[1]: *** [tcg/tcg.o] Error 1
> make: *** [subdir-x86_64-softmmu] Error 2
>
> If this macro is not used in tci, we could just delete it.
>
> Signed-off-by: Jincheng Miao <jincheng.miao@gmail.com>

Thank you for the patch!

This looks good, unfortunately someone else had already sent the same
fix. You can review their patch and add your Reviewed by line to that
patch, that will help get the fix merged.

You can see their patch here: https://patchwork.kernel.org/patch/9946503/

Thanks,
Alistair

> ---
>  tcg/tci/tcg-target.h | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h
> index 5d692e1..26140d7 100644
> --- a/tcg/tci/tcg-target.h
> +++ b/tcg/tci/tcg-target.h
> @@ -206,8 +206,4 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
>      /* no need to flush icache explicitly */
>  }
>
> -#ifdef CONFIG_SOFTMMU
> -#define TCG_TARGET_NEED_LDST_LABELS
> -#endif
> -
>  #endif /* TCG_TARGET_H */
> --
> 1.8.3.1
>
>
jincheng.miao@gmail.com Sept. 12, 2017, 2:11 a.m. UTC | #2
Good to know, and thanks for your review and remind.

Regards,
Jincheng Miao

On Tue, Sep 12, 2017 at 1:29 AM, Alistair Francis <alistair23@gmail.com> wrote:
> On Mon, Sep 11, 2017 at 5:17 PM,  <jincheng.miao@gmail.com> wrote:
>> From: Jincheng Miao <jincheng.miao@gmail.com>
>>
>> The previous commit 659ef5cbb8 enable LDST_LABELS in tci target,
>> but which causes tci build error like:
>> tcg/tcg.c:116:13: error: ‘tcg_out_ldst_finalize’ used but never defined [-Werror]
>>  static bool tcg_out_ldst_finalize(TCGContext *s);
>>              ^
>> cc1: all warnings being treated as errors
>> make[1]: *** [tcg/tcg.o] Error 1
>> make: *** [subdir-x86_64-softmmu] Error 2
>>
>> If this macro is not used in tci, we could just delete it.
>>
>> Signed-off-by: Jincheng Miao <jincheng.miao@gmail.com>
>
> Thank you for the patch!
>
> This looks good, unfortunately someone else had already sent the same
> fix. You can review their patch and add your Reviewed by line to that
> patch, that will help get the fix merged.
>
> You can see their patch here: https://patchwork.kernel.org/patch/9946503/
>
> Thanks,
> Alistair
>
>> ---
>>  tcg/tci/tcg-target.h | 4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h
>> index 5d692e1..26140d7 100644
>> --- a/tcg/tci/tcg-target.h
>> +++ b/tcg/tci/tcg-target.h
>> @@ -206,8 +206,4 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
>>      /* no need to flush icache explicitly */
>>  }
>>
>> -#ifdef CONFIG_SOFTMMU
>> -#define TCG_TARGET_NEED_LDST_LABELS
>> -#endif
>> -
>>  #endif /* TCG_TARGET_H */
>> --
>> 1.8.3.1
>>
>>
diff mbox

Patch

diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h
index 5d692e1..26140d7 100644
--- a/tcg/tci/tcg-target.h
+++ b/tcg/tci/tcg-target.h
@@ -206,8 +206,4 @@  static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
     /* no need to flush icache explicitly */
 }
 
-#ifdef CONFIG_SOFTMMU
-#define TCG_TARGET_NEED_LDST_LABELS
-#endif
-
 #endif /* TCG_TARGET_H */