From 247da19e843615724ce47fc2ac4eca15dec9e272 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Mon, 27 Nov 2017 22:33:29 +0000 Subject: [PATCH] Fix RISCV ICE on linux kernel build. gcc/ Backport from mainline 2017-11-03 Kito Cheng * config/riscv/riscv.c (riscv_legitimize_move): Handle non-legitimate address. From-SVN: r255181 --- gcc/ChangeLog | 8 ++++++++ gcc/config/riscv/riscv.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aff5491eb8f..4d541b55623 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-11-27 Jim Wilson + + Backport from mainline + 2017-11-03 Kito Cheng + + * config/riscv/riscv.c (riscv_legitimize_move): Handle + non-legitimate address. + 2017-11-24 Segher Boessenkool Backport from mainline diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index d5928c334de..6cb7113dcd3 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -1377,6 +1377,22 @@ riscv_legitimize_move (enum machine_mode mode, rtx dest, rtx src) return true; } + /* RISC-V GCC may generate non-legitimate address due to we provide some + pattern for optimize access PIC local symbol and it's make GCC generate + unrecognizable instruction during optmizing. */ + + if (MEM_P (dest) && !riscv_legitimate_address_p (mode, XEXP (dest, 0), + reload_completed)) + { + XEXP (dest, 0) = riscv_force_address (XEXP (dest, 0), mode); + } + + if (MEM_P (src) && !riscv_legitimate_address_p (mode, XEXP (src, 0), + reload_completed)) + { + XEXP (src, 0) = riscv_force_address (XEXP (src, 0), mode); + } + return false; }