summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-01-28 11:04:43 +0200
committerAlon Levy <alevy@redhat.com>2011-02-02 22:25:07 +0200
commit3b6964f27077afe321475c90693b1cf3a2208189 (patch)
tree1bfcb9fbaf039e06b458c9de5a4417d967abf0b6
parent6ce088ae7d050f99979d1163fb86138c98d99757 (diff)
(temp) gcc 4.6.0 corrections for buildusb_ccid.v16
-rw-r--r--target-i386/kvm.c3
-rw-r--r--tcg/tcg.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 05010bbc3..661ebd89d 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -891,7 +891,7 @@ static int kvm_get_xsave(CPUState *env)
#ifdef KVM_CAP_XSAVE
struct kvm_xsave* xsave;
int ret, i;
- uint16_t cwd, swd, twd, fop;
+ uint16_t cwd, swd, twd;
if (!kvm_has_xsave()) {
return kvm_get_fpu(env);
@@ -907,7 +907,6 @@ static int kvm_get_xsave(CPUState *env)
cwd = (uint16_t)xsave->region[0];
swd = (uint16_t)(xsave->region[0] >> 16);
twd = (uint16_t)xsave->region[1];
- fop = (uint16_t)(xsave->region[1] >> 16);
env->fpstt = (swd >> 11) & 7;
env->fpus = swd;
env->fpuc = cwd;
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 5dd6a2c61..b4d230b4e 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -582,6 +582,7 @@ void tcg_gen_callN(TCGContext *s, TCGv_ptr func, unsigned int flags,
nparam = gen_opparam_ptr++;
#ifdef TCG_TARGET_I386
call_type = (flags & TCG_CALL_TYPE_MASK);
+ (void)call_type;
#endif
if (ret != TCG_CALL_DUMMY_ARG) {
#if TCG_TARGET_REG_BITS < 64