From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 6 Oct 2012 16:54:46 +0000 (+0200)
Subject: Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
X-Git-Tag: v2.7.1~4309
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=046dbab95f33e007428190610d638d2fcaf37fdf;p=mirror_qemu.git

Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm

* 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Drop unused DECODE_CPREG_CRN macro
  target-arm: use deposit instead of hardcoded version
  target-arm: mark a few integer helpers const and pure
  target-arm: convert sar, shl and shr helpers to TCG
  target-arm: convert add_cc and sub_cc helpers to TCG
  target-arm: use globals for CC flags
  target-arm: Reinstate display of VFP registers in cpu_dump_state
  cpu_dump_state: move DUMP_FPU and DUMP_CCOP flags from x86-only to generic
---

046dbab95f33e007428190610d638d2fcaf37fdf