Apply from mainline.

	2011-05-12  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
	PR gas/12715
	* gas/config/tc-arm.c (parse_big_immediate):  Fix parsing of 64-bit
	immediates on 32-bit hosts.
	* gas/testsuite/gas/arm/neon-const.s: Add testcase for 64-bit Neon constants.
	* gas/testsuite/gas/arm/neon-const.d: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8b71bdfce0e0bfcc7afee6fd710fe689d4e8ef88..c335808518642f7e725e33a6eb529acd70548226 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-13  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+       Apply from mainline.
+       2011-05-12  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+       PR gas/12715
+       * config/tc-arm.c (parse_big_immediate):  Fix parsing of 64-bit
+       immediates on 32-bit hosts.
+
 2011-05-13  Frederic Marchal  <fmarchal@perso.be>
 
        PR gas/12755

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index f4ebdc4e24901bd17cd9645cf087b78d6ad6eac3..4addafce1fff39d458a9d57d4146267ba3b7be94 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -4421,7 +4421,7 @@ parse_big_immediate (char **str, int i)
       /* If we're on a 64-bit host, then a 64-bit number can be returned using
         O_constant.  We have to be careful not to break compilation for
         32-bit X_add_number, though.  */
-      if ((exp.X_add_number & ~0xffffffffl) != 0)
+      if ((exp.X_add_number & ~(offsetT)(0xffffffffU)) != 0)
        {
           /* X >> 32 is illegal if sizeof (exp.X_add_number) == 4.  */
          inst.operands[i].reg = ((exp.X_add_number >> 16) >> 16) & 0xffffffff;

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index be592237710a2612c44096a40962b19db2ae9754..211debff432917162b07c35ff165e5b7958633cc 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-13  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+       Apply from mainline. 
+       2011-05-12  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+       PR gas/12715
+       * gas/arm/neon-const.s: Add testcase for 64-bit Neon constants.
+       * gas/arm/neon-const.d: Likewise.
+
 2011-04-27  Alan Modra  <amodra@gmail.com>
 
        Apply from mainline.

diff --git a/gas/testsuite/gas/arm/neon-const.d b/gas/testsuite/gas/arm/neon-const.d
index a1bc97cf381ffe9f25add4c06e13e51255abfa21..6c46930b7e0f303e6809077660a802de91e17108 100644 (file)
--- a/gas/testsuite/gas/arm/neon-const.d
+++ b/gas/testsuite/gas/arm/neon-const.d
@@ -263,3 +263,4 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> f3850f5f    vmov\.f32       q0, #-0\.484375 ; 0xbef80000
 0[0-9a-f]+ <[^>]+> f3860f5f    vmov\.f32       q0, #-0\.96875  ; 0xbf780000
 0[0-9a-f]+ <[^>]+> f3870f5f    vmov\.f32       q0, #-1\.9375   ; 0xbff80000
+0[0-9a-f]+ <[^>]+> f3879e3f    vmov\.i64       d9, #0xffffffffffffffff

diff --git a/gas/testsuite/gas/arm/neon-const.s b/gas/testsuite/gas/arm/neon-const.s
index a6fb55075a934b9c3a830dbfa93825a5a7b3fd34..aaaf14412318be8bae38028b10cf95cc9c11e177 100644 (file)
--- a/gas/testsuite/gas/arm/neon-const.s
+++ b/gas/testsuite/gas/arm/neon-const.s
@@ -295,3 +295,5 @@
         vmov.f32 q0, -0.484375
         vmov.f32 q0, -0.96875
         vmov.f32 q0, -1.9375
+
+       vmov.i64 d9, #0xffffffffffffffff