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

diff --combined cpus.c
index 1d5d4904cc960d4cd25d3fae59418b11830ceace,5ba87fe0cc235bc5990d4d100b48022108f6a77b..750a76fbc8c5184e8d72965f1efa2d1e168becfb
--- 1/cpus.c
--- 2/cpus.c
+++ b/cpus.c
@@@ -395,11 -395,7 +395,7 @@@ void hw_error(const char *fmt, ...
      fprintf(stderr, "\n");
      for(env = first_cpu; env != NULL; env = env->next_cpu) {
          fprintf(stderr, "CPU #%d:\n", env->cpu_index);
- #ifdef TARGET_I386
-         cpu_dump_state(env, stderr, fprintf, X86_DUMP_FPU);
- #else
-         cpu_dump_state(env, stderr, fprintf, 0);
- #endif
+         cpu_dump_state(env, stderr, fprintf, CPU_DUMP_FPU);
      }
      va_end(ap);
      abort();
@@@ -613,7 -609,7 +609,7 @@@ static void qemu_tcg_init_cpu_signals(v
  }
  #endif /* _WIN32 */
  
 -QemuMutex qemu_global_mutex;
 +static QemuMutex qemu_global_mutex;
  static QemuCond qemu_io_proceeded_cond;
  static bool iothread_requesting_mutex;