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

* 'for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Fix BASEPRI, BASEPRI_MAX, and FAULTMASK access
  target-arm: Minimal implementation of performance counters
  Revert "Makefile.target: Allow target helpers to be in any *_helper.c file"
  Revert "target-arm: Use global env in neon_helper.c helpers"
  target-arm: Pass fp status pointer explicitly to neon fp helpers
  target-arm: Make VFP binop helpers take pointer to fpstatus, not CPUState
  target-arm: Add helper function to generate code to get fpstatus pointer
  Revert "target-arm: Use global env in iwmmxt_helper.c helpers"

Conflicts:
	Makefile.target

diff --cc Makefile.target
index c566eb1149276f27bcf1a04c89c8b8934983ec17,37bb28ed8a2e004cced198bf18bf0064c181efb2..fe785161cb40d3423201618b0336614297aeaeb5
--- 1/Makefile.target
--- 2/Makefile.target
+++ b/Makefile.target
@@@ -95,7 -91,7 +95,7 @@@ tcg/tcg.o: cpu.
  
  # HELPER_CFLAGS is used for all the code compiled with static register
  # variables
- %_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
 -op_helper.o cpu-exec.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
++op_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
  
  # Note: this is a workaround. The real fix is to avoid compiling
  # cpu_signal_handler() in user-exec.c.

diff --cc target-arm/cpu.h
Simple merge

diff --cc target-arm/helper.c
Simple merge

diff --cc target-arm/translate.c
Simple merge