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