Changeset 105d8d6 in mainline

Timestamp:

2014-09-11T19:19:25Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

15d0046, 5441670, 8e7c9fe

Parents:

c4f67c8

Message:

Upgrade qfs.sh to QEMU 2.1.1.

File:

• contrib/qfs/qfs.sh (modified) (2 diffs)

contrib/qfs/qfs.sh

@@ -28 +28 @@
 #
 
-VERSION=2.1.0
+VERSION=2.1.1
 BASENAME=qemu-${VERSION}
 TARBALL=${BASENAME}.tar.bz2
 SOURCEDIR=${BASENAME}
 URL=http://wiki.qemu-project.org/download/${TARBALL}
-MD5="6726977292b448cbc7f89998fac6983b"
+MD5="78b1b51bfa2eee424e1bfdf3b66daa64"
 
 if [ ! -f ${TARBALL} ];
@@ -50 +50 @@
 cd ${SOURCEDIR}
 
-patch -p 1 <<EOF
-diff --git a/target-arm/cpu.h b/target-arm/cpu.h
-index 8098b8d..659b104 100644
---- a/target-arm/cpu.h
-+++ b/target-arm/cpu.h
-@@ -1255,7 +1255,14 @@ static inline bool arm_singlestep_active(CPUARMState *env)
- static inline void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
-                                         target_ulong *cs_base, int *flags)
- {
--    int fpen = extract32(env->cp15.c1_coproc, 20, 2);
-+    int fpen;
-+
-+    if (arm_feature(env, ARM_FEATURE_V6)) {
-+        fpen = extract32(env->cp15.c1_coproc, 20, 2);
-+    } else {
-+        /* CPACR doesn't exist before v6, so VFP is always accessible */
-+        fpen = 3;
-+    }
- 
-     if (is_a64(env)) {
-         *pc = env->pc;
-EOF
-
 ./configure --target-list=i386-softmmu,x86_64-softmmu,arm-softmmu,ppc-softmmu,sparc-softmmu,sparc64-softmmu,mips-softmmu,mipsel-softmmu --audio-drv-list=pa