* config/tc-arm.c (rotate_left): Avoid undefined behaviour when N = 0.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 97e5a9ef9b6d522b4b0c3c7adfe0cd770cc0a7fd..a9481f5ee9ac08ec304d6557a1eaac5cfc8142b0 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-20  Richard Earnshaw  <rearnsha@arm.com>
+
+       * config/tc-arm.c (rotate_left): Avoid undefined behaviour when
+       N = 0.
+
 2014-11-20  Richard Earnshaw  <rearnsha@arm.com>
 
        * config/tc-aarch64.c (warn_unpredictable_ldst): Check that transfer

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 5077f87ea4f2e5403524e6823f5da938d0ffbfca..9100fb252adbaf5524ccfff0663fc9af254c35f1 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -7251,7 +7251,7 @@ parse_operands (char *str, const unsigned int *pattern, bfd_boolean thumb)
 
 /* Functions for operand encoding.  ARM, then Thumb.  */
 
-#define rotate_left(v, n) (v << n | v >> (32 - n))
+#define rotate_left(v, n) (v << (n & 31) | v >> ((32 - n) & 31))
 
 /* If VAL can be encoded in the immediate field of an ARM instruction,
    return the encoded form.  Otherwise, return FAIL.  */