blob: 7e3accad02c697ae2fe63b0c9a6ed483d73966c0 [file] [log] [blame]
Brad Bishop26bdd442019-08-16 17:08:17 -04001From 1eec84c155aeaeead673310f83293853f01b578d Mon Sep 17 00:00:00 2001
2From: Nagaraju Mekala <nmekala@xilix.com>
3Date: Thu, 29 Nov 2018 17:59:25 +0530
4Subject: [PATCH] fixing the long & long long mingw toolchain issue
5
6Signed-off-by: Mahesh Bodapati <mbodapat@xilinx.com>
7Signed-off-by: Nagaraju Mekala <nagaraju.mekala@xilinx.com>
8
9---
10 gas/config/tc-microblaze.c | 10 +++++-----
11 opcodes/microblaze-opc.h | 4 ++--
12 2 files changed, 7 insertions(+), 7 deletions(-)
13
14diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
15index b3e49f0..5b506d3 100644
16--- a/gas/config/tc-microblaze.c
17+++ b/gas/config/tc-microblaze.c
18@@ -783,7 +783,7 @@ parse_imm (char * s, expressionS * e, offsetT min, offsetT max)
19 }
20
21 static char *
22-parse_imml (char * s, expressionS * e, long min, long max)
23+parse_imml (char * s, expressionS * e, long long min, long long max)
24 {
25 char *new_pointer;
26 char *atp;
27@@ -834,11 +834,11 @@ parse_imml (char * s, expressionS * e, long min, long max)
28 ; /* An error message has already been emitted. */
29 else if ((e->X_op != O_constant && e->X_op != O_symbol) )
30 as_fatal (_("operand must be a constant or a label"));
31- else if ((e->X_op == O_constant) && ((long) e->X_add_number < min
32- || (long) e->X_add_number > max))
33+ else if ((e->X_op == O_constant) && ((long long) e->X_add_number < min
34+ || (long long) e->X_add_number > max))
35 {
36- as_fatal (_("operand must be absolute in range %ld..%ld, not %ld"),
37- min, max, (long) e->X_add_number);
38+ as_fatal (_("operand must be absolute in range %lld..%lld, not %lld"),
39+ min, max, (long long) e->X_add_number);
40 }
41
42 if (atp)
43diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
44index 824afc0..d59ee0a 100644
45--- a/opcodes/microblaze-opc.h
46+++ b/opcodes/microblaze-opc.h
47@@ -585,8 +585,8 @@ char pvr_register_prefix[] = "rpvr";
48 #define MIN_IMM6_WIDTH ((int) 0x00000001)
49 #define MAX_IMM6_WIDTH ((int) 0x00000040)
50
51-#define MIN_IMML ((long) 0xffffff8000000000L)
52-#define MAX_IMML ((long) 0x0000007fffffffffL)
53+#define MIN_IMML ((long long) 0xffffff8000000000L)
54+#define MAX_IMML ((long long) 0x0000007fffffffffL)
55
56 #endif /* MICROBLAZE_OPC */
57