Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 105d8d6 in mainline


Ignore:
Timestamp:
2014-09-11T19:19:25Z (6 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
15d0046, 5441670, 8e7c9fe
Parents:
c4f67c8
Message:

Upgrade qfs.sh to QEMU 2.1.1.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/qfs/qfs.sh

    rc4f67c8 r105d8d6  
    2828#
    2929
    30 VERSION=2.1.0
     30VERSION=2.1.1
    3131BASENAME=qemu-${VERSION}
    3232TARBALL=${BASENAME}.tar.bz2
    3333SOURCEDIR=${BASENAME}
    3434URL=http://wiki.qemu-project.org/download/${TARBALL}
    35 MD5="6726977292b448cbc7f89998fac6983b"
     35MD5="78b1b51bfa2eee424e1bfdf3b66daa64"
    3636
    3737if [ ! -f ${TARBALL} ];
     
    5050cd ${SOURCEDIR}
    5151
    52 patch -p 1 <<EOF
    53 diff --git a/target-arm/cpu.h b/target-arm/cpu.h
    54 index 8098b8d..659b104 100644
    55 --- a/target-arm/cpu.h
    56 +++ b/target-arm/cpu.h
    57 @@ -1255,7 +1255,14 @@ static inline bool arm_singlestep_active(CPUARMState *env)
    58  static inline void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
    59                                          target_ulong *cs_base, int *flags)
    60  {
    61 -    int fpen = extract32(env->cp15.c1_coproc, 20, 2);
    62 +    int fpen;
    63 +
    64 +    if (arm_feature(env, ARM_FEATURE_V6)) {
    65 +        fpen = extract32(env->cp15.c1_coproc, 20, 2);
    66 +    } else {
    67 +        /* CPACR doesn't exist before v6, so VFP is always accessible */
    68 +        fpen = 3;
    69 +    }
    70  
    71      if (is_a64(env)) {
    72          *pc = env->pc;
    73 EOF
    74 
    7552./configure --target-list=i386-softmmu,x86_64-softmmu,arm-softmmu,ppc-softmmu,sparc-softmmu,sparc64-softmmu,mips-softmmu,mipsel-softmmu --audio-drv-list=pa
    7653
Note: See TracChangeset for help on using the changeset viewer.