Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 1 | From a56b23ae244eee1da6d6595d3a6477085d77271e Mon Sep 17 00:00:00 2001 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 2 | From: Nagaraju Mekala <nmekala@xilix.com> |
| 3 | Date: Thu, 29 Nov 2018 17:55:08 +0530 |
Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 4 | Subject: [PATCH 55/63] fixing the long & long long mingw toolchain issue |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 5 | |
| 6 | --- |
| 7 | gcc/config/microblaze/constraints.md | 2 +- |
| 8 | gcc/config/microblaze/microblaze.md | 8 ++++---- |
| 9 | 2 files changed, 5 insertions(+), 5 deletions(-) |
| 10 | |
| 11 | diff --git a/gcc/config/microblaze/constraints.md b/gcc/config/microblaze/constraints.md |
Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 12 | index 2fce91e..9a5aa6b 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 13 | --- a/gcc/config/microblaze/constraints.md |
| 14 | +++ b/gcc/config/microblaze/constraints.md |
| 15 | @@ -55,7 +55,7 @@ |
| 16 | (define_constraint "K" |
| 17 | "A constant in the range 0xffffff8000000000L to 0x0000007fffffffffL (inclusive)." |
| 18 | (and (match_code "const_int") |
| 19 | - (match_test "ival > (long)-549755813888 && ival < (long)549755813887"))) |
| 20 | + (match_test "ival > (long long)-549755813888 && ival < (long long)549755813887"))) |
| 21 | |
| 22 | ;; Define floating point constraints |
| 23 | |
| 24 | diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md |
Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 25 | index 6b6b7c6..a1dc41f 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 26 | --- a/gcc/config/microblaze/microblaze.md |
| 27 | +++ b/gcc/config/microblaze/microblaze.md |
Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 28 | @@ -648,8 +648,8 @@ |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 29 | if (TARGET_MB_64) |
| 30 | { |
| 31 | if (GET_CODE (operands[2]) == CONST_INT && |
| 32 | - INTVAL(operands[2]) < (long)-549755813888 && |
| 33 | - INTVAL(operands[2]) > (long)549755813887) |
| 34 | + INTVAL(operands[2]) < (long long)-549755813888 && |
| 35 | + INTVAL(operands[2]) > (long long)549755813887) |
| 36 | FAIL; |
| 37 | } |
| 38 | }) |
Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 39 | @@ -1266,7 +1266,7 @@ |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 40 | (match_operand:DI 1 "immediate_operand" "J,I,Mnis"))] |
| 41 | "TARGET_MB_64 && (register_operand (operands[0], DImode) && |
| 42 | (GET_CODE (operands[1]) == CONST_INT && |
| 43 | - (INTVAL (operands[1]) <= (long)549755813887 && INTVAL (operands[1]) >= (long)-549755813888)))" |
| 44 | + (INTVAL (operands[1]) <= (long long)549755813887 && INTVAL (operands[1]) >= (long long)-549755813888)))" |
| 45 | "@ |
| 46 | addlk\t%0,r0,r0\t |
| 47 | addlik\t%0,r0,%1\t #N1 %X1 |
Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame] | 48 | @@ -1300,7 +1300,7 @@ |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 49 | case 1: |
| 50 | case 2: |
| 51 | if (GET_CODE (operands[1]) == CONST_INT && |
| 52 | - (INTVAL (operands[1]) > (long)549755813887 || INTVAL (operands[1]) < (long)-549755813888)) |
| 53 | + (INTVAL (operands[1]) > (long long)549755813887 || INTVAL (operands[1]) < (long long)-549755813888)) |
| 54 | return "addlik\t%0,r0,%h1\n\tbsllli\t%0,%0,32\n\taddlik\t%0,%0,%j1 #li => la"; |
| 55 | else |
| 56 | return "addlik\t%0,r0,%1"; |
| 57 | -- |
| 58 | 2.7.4 |
| 59 | |