Patchwork tci: Fix build breakage (unresolved symbol tcg_out_tb_finalize)

login
register
mail settings
Submitter Stefan Weil
Date Nov. 18, 2012, 7:16 p.m.
Message ID <1353266186-2890-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/199907/
State Accepted
Headers show

Comments

Stefan Weil - Nov. 18, 2012, 7:16 p.m.
Commit 32761257c0b9fa7ee04d2871a6e48a41f119c469 enabled
qemu_ld/st optimization unconditionally for some hosts.

The TCG interpreter still does not support this kind of
optimization. Therefore builds with TCI fail with an
unresolved symbol tcg_out_tb_finalize. This is fixed here.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 configure |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Blue Swirl - Nov. 18, 2012, 9:10 p.m.
Thanks, applied.

On Sun, Nov 18, 2012 at 7:16 PM, Stefan Weil <sw@weilnetz.de> wrote:
> Commit 32761257c0b9fa7ee04d2871a6e48a41f119c469 enabled
> qemu_ld/st optimization unconditionally for some hosts.
>
> The TCG interpreter still does not support this kind of
> optimization. Therefore builds with TCI fail with an
> unresolved symbol tcg_out_tb_finalize. This is fixed here.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  configure |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 19775bc..7cf990c 100755
> --- a/configure
> +++ b/configure
> @@ -3908,7 +3908,10 @@ upper() {
>
>  case "$cpu" in
>    i386|x86_64|ppc)
> -    echo "CONFIG_QEMU_LDST_OPTIMIZATION=y" >> $config_target_mak
> +    # The TCG interpreter currently does not support ld/st optimization.
> +    if test "$tcg_interpreter" = "no" ; then
> +        echo "CONFIG_QEMU_LDST_OPTIMIZATION=y" >> $config_target_mak
> +    fi
>    ;;
>  esac
>
> --
> 1.7.10.4
>

Patch

diff --git a/configure b/configure
index 19775bc..7cf990c 100755
--- a/configure
+++ b/configure
@@ -3908,7 +3908,10 @@  upper() {
 
 case "$cpu" in
   i386|x86_64|ppc)
-    echo "CONFIG_QEMU_LDST_OPTIMIZATION=y" >> $config_target_mak
+    # The TCG interpreter currently does not support ld/st optimization.
+    if test "$tcg_interpreter" = "no" ; then
+        echo "CONFIG_QEMU_LDST_OPTIMIZATION=y" >> $config_target_mak
+    fi
   ;;
 esac