Message ID | 20210124211119.35563-1-richard.henderson@linaro.org |
---|---|
State | New |
Headers | show |
Series | configure: Fix --enable-tcg-interpreter | expand |
On 1/24/21 11:11 AM, Richard Henderson wrote: > The configure option was backward, and we failed to > pass the value on to meson. > > Fixes: 23a77b2d18b > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > configure | 5 +++-- > tcg/tci/tcg-target.c.inc | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) Bah. Of course the tcg/tci/ hunk is unrelated, and snuck in with a git commit -a.
On 1/24/21 10:13 PM, Richard Henderson wrote: > On 1/24/21 11:11 AM, Richard Henderson wrote: >> The configure option was backward, and we failed to >> pass the value on to meson. o_O >> >> Fixes: 23a77b2d18b >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> configure | 5 +++-- >> tcg/tci/tcg-target.c.inc | 2 +- >> 2 files changed, 4 insertions(+), 3 deletions(-) > > Bah. Of course the tcg/tci/ hunk is unrelated, > and snuck in with a git commit -a. configure part: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 1/24/21 10:20 PM, Philippe Mathieu-Daudé wrote: > On 1/24/21 10:13 PM, Richard Henderson wrote: >> On 1/24/21 11:11 AM, Richard Henderson wrote: >>> The configure option was backward, and we failed to >>> pass the value on to meson. > > o_O > >>> >>> Fixes: 23a77b2d18b >>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >>> --- >>> configure | 5 +++-- >>> tcg/tci/tcg-target.c.inc | 2 +- >>> 2 files changed, 4 insertions(+), 3 deletions(-) >> >> Bah. Of course the tcg/tci/ hunk is unrelated, >> and snuck in with a git commit -a. > configure part: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/configure b/configure index dcc5ea7d63..ad35e26168 100755 --- a/configure +++ b/configure @@ -1119,9 +1119,9 @@ for opt do ;; --enable-whpx) whpx="enabled" ;; - --disable-tcg-interpreter) tcg_interpreter="true" + --disable-tcg-interpreter) tcg_interpreter="false" ;; - --enable-tcg-interpreter) tcg_interpreter="false" + --enable-tcg-interpreter) tcg_interpreter="true" ;; --disable-cap-ng) cap_ng="disabled" ;; @@ -6374,6 +6374,7 @@ NINJA=$ninja $meson setup \ -Dvhost_user_blk_server=$vhost_user_blk_server \ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \ $(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \ + -Dtcg_interpreter=$tcg_interpreter \ $cross_arg \ "$PWD" "$source_path" diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 147c99e7e6..eb7ab1be7b 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -780,7 +780,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op) case INDEX_op_add2_i64: case INDEX_op_sub2_i32: case INDEX_op_sub2_i64: - return C_O2_I4(r, r, 0, 1, re, re) + return C_O2_I4(r, r, 0, 1, re, re); case INDEX_op_setcond2_i32: return C_O1_I4(r, r, r, re, re);
The configure option was backward, and we failed to pass the value on to meson. Fixes: 23a77b2d18b Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- configure | 5 +++-- tcg/tci/tcg-target.c.inc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)