diff options
| author | jye2 <jye2@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-19 12:30:17 +0000 |
|---|---|---|
| committer | jye2 <jye2@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-19 12:30:17 +0000 |
| commit | 59ced34d9357f7b22c57333fccf86a708ab3b3cf (patch) | |
| tree | be31a3efd37831232c028d4060a11d9debf995ed | |
| parent | 494c27b7eefcd39177a45b40df82c20add893619 (diff) | |
| download | gcc-59ced34d9357f7b22c57333fccf86a708ab3b3cf.tar.gz | |
2012-06-19 Joey Ye <joey.ye@arm.com>
Backported from mainline
2011-10-14 David Alan Gilbert <david.gilbert@linaro.org>
* config/arm/arm.h (TARGET_HAVE_DMB_MCR): MCR Not available in Thumb1.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@188774 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/arm/arm.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6a30d39d8d5..868f0468043 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-06-19 Joey Ye <joey.ye@arm.com> + + Backported from mainline + 2011-10-14 David Alan Gilbert <david.gilbert@linaro.org> + + * config/arm/arm.h (TARGET_HAVE_DMB_MCR): MCR Not available in Thumb1. + 2012-06-18 Joey Ye <joey.ye@arm.com> Backported from mainline diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 151d3141381..292b48f96de 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -294,7 +294,8 @@ extern void (*arm_lang_output_object_attributes_hook)(void); #define TARGET_HAVE_DMB (arm_arch7) /* Nonzero if this chip implements a memory barrier via CP15. */ -#define TARGET_HAVE_DMB_MCR (arm_arch6k && ! TARGET_HAVE_DMB) +#define TARGET_HAVE_DMB_MCR (arm_arch6 && ! TARGET_HAVE_DMB \ + && ! TARGET_THUMB1) /* Nonzero if this chip implements a memory barrier instruction. */ #define TARGET_HAVE_MEMORY_BARRIER (TARGET_HAVE_DMB || TARGET_HAVE_DMB_MCR) |