aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkugan <kugan@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-08 20:55:05 +0000
committerkugan <kugan@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-08 20:55:05 +0000
commit638949d0a64a1e3bb5c35c4b2539b3e76c3e503f (patch)
tree346c5a130fa40d152648a1b76079e054ca541065
parentc1d3b6e45727b42a123b1e3a7b8285c23c2aea8f (diff)
2015-04-09 Kugan Vivekanandarajah <kugan.vivekanandarajah@linaro.org>
Backport from trunk r219544. 2015-01-13 Renlin Li <renlin.li@arm.com> * config/arm/arm.h (CLZ_DEFINED_VALUE_AT_ZERO): Return 2. (CTZ_DEFINED_VALUE_AT_ZERO): Ditto git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@221934 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.linaro8
-rw-r--r--gcc/config/arm/arm.h4
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro
index 0871a264aa7..4bb4cf9e340 100644
--- a/gcc/ChangeLog.linaro
+++ b/gcc/ChangeLog.linaro
@@ -1,3 +1,11 @@
+2015-04-09 Kugan Vivekanandarajah <kugan.vivekanandarajah@linaro.org>
+
+ Backport from trunk r219544.
+ 2015-01-13 Renlin Li <renlin.li@arm.com>
+
+ * config/arm/arm.h (CLZ_DEFINED_VALUE_AT_ZERO): Return 2.
+ (CTZ_DEFINED_VALUE_AT_ZERO): Ditto.
+
2015-04-08 Charles Baylis <charles.baylis@linaro.org>
Backport from trunk r215567, r216672.
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 9b08e815a75..6bdc5730f77 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2142,9 +2142,9 @@ extern int making_const_table;
: reverse_condition (code))
#define CLZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) \
- ((VALUE) = GET_MODE_UNIT_BITSIZE (MODE))
+ ((VALUE) = GET_MODE_UNIT_BITSIZE (MODE), 2)
#define CTZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) \
- ((VALUE) = GET_MODE_UNIT_BITSIZE (MODE))
+ ((VALUE) = GET_MODE_UNIT_BITSIZE (MODE), 2)
#define CC_STATUS_INIT \
do { cfun->machine->thumb1_cc_insn = NULL_RTX; } while (0)