From: Joey Ye Date: Tue, 19 Jun 2012 12:30:17 +0000 (+0000) Subject: backport: arm.h (TARGET_HAVE_DMB_MCR): MCR Not available in Thumb1. X-Git-Tag: releases/gcc-4.6.4~485 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95a2f61228f83d342563fe60cf6785e5fbebe028;p=thirdparty%2Fgcc.git backport: arm.h (TARGET_HAVE_DMB_MCR): MCR Not available in Thumb1. 2012-06-19 Joey Ye Backported from mainline 2011-10-14 David Alan Gilbert * config/arm/arm.h (TARGET_HAVE_DMB_MCR): MCR Not available in Thumb1. From-SVN: r188774 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6a30d39d8d5a..868f04680438 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-06-19 Joey Ye + + Backported from mainline + 2011-10-14 David Alan Gilbert + + * config/arm/arm.h (TARGET_HAVE_DMB_MCR): MCR Not available in Thumb1. + 2012-06-18 Joey Ye Backported from mainline diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 151d31413817..292b48f96de8 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)