diff options
author | Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> | 2019-03-22 16:15:08 -0700 |
---|---|---|
committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-06-28 16:32:42 -0700 |
commit | 3280ab0e35873213f4d52019ff22bbcef4fe09d0 (patch) | |
tree | 4ca2b913332b50181be05a3e6f619caa59380eef | |
parent | eca44e3e9f65a242c384735946307c663b87804b (diff) | |
download | meta-xilinx-3280ab0e35873213f4d52019ff22bbcef4fe09d0.tar.gz |
gcc8: update microblaze patches
keep the list of patches to be applied updated with the Xilinx SDK repo
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
4 files changed, 145 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-fixing-the-long-long-long-mingw-toolchain-issue.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-fixing-the-long-long-long-mingw-toolchain-issue.patch new file mode 100644 index 00000000..4c694723 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-fixing-the-long-long-long-mingw-toolchain-issue.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 76e231f92afd8fda13d6ae18ef3aef0ea6096489 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nagaraju Mekala <nmekala@xilix.com> | ||
3 | Date: Thu, 29 Nov 2018 17:55:08 +0530 | ||
4 | Subject: [PATCH 55/57] fixing the long & long long mingw toolchain issue | ||
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 | ||
12 | index 867a7b5..27c6bfc 100644 | ||
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 | ||
25 | index cbd7e77..e03b835 100644 | ||
26 | --- a/gcc/config/microblaze/microblaze.md | ||
27 | +++ b/gcc/config/microblaze/microblaze.md | ||
28 | @@ -646,8 +646,8 @@ | ||
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 | }) | ||
39 | @@ -1264,7 +1264,7 @@ | ||
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 | ||
48 | @@ -1298,7 +1298,7 @@ | ||
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 | |||
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0056-fix-the-lto-wrapper-issue-on-windows.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0056-fix-the-lto-wrapper-issue-on-windows.patch new file mode 100644 index 00000000..ff524770 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0056-fix-the-lto-wrapper-issue-on-windows.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From f30b99b5b8d3f2a8d8e4973cd155a4b9f1849039 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nagaraju <nmekala@xilinx.com> | ||
3 | Date: Thu, 14 Mar 2019 18:08:06 +0530 | ||
4 | Subject: [PATCH 56/57] fix the lto-wrapper issue on windows | ||
5 | |||
6 | --- | ||
7 | libiberty/simple-object.c | 6 +++++- | ||
8 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/libiberty/simple-object.c b/libiberty/simple-object.c | ||
11 | index 42aa6ac..d2465c6 100644 | ||
12 | --- a/libiberty/simple-object.c | ||
13 | +++ b/libiberty/simple-object.c | ||
14 | @@ -44,6 +44,10 @@ Boston, MA 02110-1301, USA. */ | ||
15 | #define SEEK_SET 0 | ||
16 | #endif | ||
17 | |||
18 | +#ifndef O_BINARY | ||
19 | +#define O_BINARY 0 | ||
20 | +#endif | ||
21 | + | ||
22 | #include "simple-object-common.h" | ||
23 | |||
24 | /* The known object file formats. */ | ||
25 | @@ -326,7 +330,7 @@ simple_object_copy_lto_debug_sections (simple_object_read *sobj, | ||
26 | return errmsg; | ||
27 | } | ||
28 | |||
29 | - outfd = creat (dest, 00777); | ||
30 | + outfd = open (dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 00777); | ||
31 | if (outfd == -1) | ||
32 | { | ||
33 | *err = errno; | ||
34 | -- | ||
35 | 2.7.4 | ||
36 | |||
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0057-Fix-the-MB-64-bug-of-handling-QI-objects.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0057-Fix-the-MB-64-bug-of-handling-QI-objects.patch new file mode 100644 index 00000000..a5a2039d --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0057-Fix-the-MB-64-bug-of-handling-QI-objects.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 6c58973f1cc1e37773aeab583aa3ac6331489106 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nagaraju <nmekala@xilinx.com> | ||
3 | Date: Thu, 14 Mar 2019 18:11:04 +0530 | ||
4 | Subject: [PATCH 57/57] Fix the MB-64 bug of handling QI objects | ||
5 | |||
6 | --- | ||
7 | gcc/config/microblaze/microblaze.md | 14 +++++++------- | ||
8 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
9 | |||
10 | diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md | ||
11 | index e03b835..88aee9e 100644 | ||
12 | --- a/gcc/config/microblaze/microblaze.md | ||
13 | +++ b/gcc/config/microblaze/microblaze.md | ||
14 | @@ -2345,11 +2345,11 @@ else | ||
15 | |||
16 | (define_insn "branch_zero_64" | ||
17 | [(set (pc) | ||
18 | - (if_then_else (match_operator:SI 0 "ordered_comparison_operator" | ||
19 | + (if_then_else (match_operator 0 "ordered_comparison_operator" | ||
20 | [(match_operand:SI 1 "register_operand" "d") | ||
21 | (const_int 0)]) | ||
22 | - (match_operand:SI 2 "pc_or_label_operand" "") | ||
23 | - (match_operand:SI 3 "pc_or_label_operand" ""))) | ||
24 | + (match_operand 2 "pc_or_label_operand" "") | ||
25 | + (match_operand 3 "pc_or_label_operand" ""))) | ||
26 | ] | ||
27 | "TARGET_MB_64" | ||
28 | { | ||
29 | @@ -2365,11 +2365,11 @@ else | ||
30 | |||
31 | (define_insn "long_branch_zero" | ||
32 | [(set (pc) | ||
33 | - (if_then_else (match_operator 0 "ordered_comparison_operator" | ||
34 | - [(match_operand 1 "register_operand" "d") | ||
35 | + (if_then_else (match_operator:DI 0 "ordered_comparison_operator" | ||
36 | + [(match_operand:DI 1 "register_operand" "d") | ||
37 | (const_int 0)]) | ||
38 | - (match_operand 2 "pc_or_label_operand" "") | ||
39 | - (match_operand 3 "pc_or_label_operand" ""))) | ||
40 | + (match_operand:DI 2 "pc_or_label_operand" "") | ||
41 | + (match_operand:DI 3 "pc_or_label_operand" ""))) | ||
42 | ] | ||
43 | "TARGET_MB_64" | ||
44 | { | ||
45 | -- | ||
46 | 2.7.4 | ||
47 | |||
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend index a1148a8f..9a404a01 100644 --- a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend | |||
@@ -55,4 +55,7 @@ file://0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch \ | |||
55 | file://0052-fixing-the-32bit-LTO-related-issue9-1014024.patch \ | 55 | file://0052-fixing-the-32bit-LTO-related-issue9-1014024.patch \ |
56 | file://0053-Fixed-the-missing-stack-adjustment-in-prologue-of-mo.patch \ | 56 | file://0053-Fixed-the-missing-stack-adjustment-in-prologue-of-mo.patch \ |
57 | file://0054-Patch-Microblaze-corrected-SPN-for-dlong-instruction.patch \ | 57 | file://0054-Patch-Microblaze-corrected-SPN-for-dlong-instruction.patch \ |
58 | file://0055-fixing-the-long-long-long-mingw-toolchain-issue.patch \ | ||
59 | file://0056-fix-the-lto-wrapper-issue-on-windows.patch \ | ||
60 | file://0057-Fix-the-MB-64-bug-of-handling-QI-objects.patch \ | ||
58 | " | 61 | " |