diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-07-20 20:23:01 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-07-20 20:23:01 +0000 |
| commit | a3ce3668ccff7d350a4f795ad99a012a6d41caef (patch) | |
| tree | 01f5f907ceaba5daaf3509b0a051dd8c76339271 /Makefile.target | |
| parent | 03ff09580ef6cbc4a893b6e3e6bbff33180ec70a (diff) | |
| parent | 82845826e89fdc02f6f000fca5d5019ec9be4ab3 (diff) | |
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
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index c566eb1149..fe785161cb 100644 --- a/Makefile.target +++ b/Makefile.target @@ -95,7 +95,7 @@ tcg/tcg.o: cpu.h # 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 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. |