diff options
| author | cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-22 12:23:20 +0000 |
|---|---|---|
| committer | cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-22 12:23:20 +0000 |
| commit | 3e326557585ffde323867375539f04643fcad29a (patch) | |
| tree | f4ae7ecab42070a0a9d12760422be9170aab3f2f | |
| parent | ab0c752a1671499fc2de8fcf87b2c55ee9ba1a18 (diff) | |
| download | gcc-3e326557585ffde323867375539f04643fcad29a.tar.gz | |
2015-09-22 Chung-Lin Tang <cltang@codesourcery.com>
Backport from mainline
2015-09-22 Chung-Lin Tang <cltang@codesourcery.com>
* config/nios2/nios2.c (nios2_legitimize_address): When handling
'reg + reloc' cases, allow first operand to be non-REG, and use
force_reg() to enforce address pattern.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@228013 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/nios2/nios2.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b3c1ceb459b..937c02cfdb2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2015-09-22 Chung-Lin Tang <cltang@codesourcery.com> + + Backport from mainline + 2015-09-22 Chung-Lin Tang <cltang@codesourcery.com> + + * config/nios2/nios2.c (nios2_legitimize_address): When handling + 'reg + reloc' cases, allow first operand to be non-REG, and use + force_reg() to enforce address pattern. + 2015-09-22 Kirill Yukhin <kirill.yukhin@intel.com> * gcc/config/i386/i386.md (define_insn "kunpckhi"): Fix diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c index 848cc513537..7b6b389989b 100644 --- a/gcc/config/nios2/nios2.c +++ b/gcc/config/nios2/nios2.c @@ -1894,15 +1894,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, Which will be output as '%tls_le(var+48)(r23)' in assembly. */ if (GET_CODE (x) == PLUS - && GET_CODE (XEXP (x, 0)) == REG && GET_CODE (XEXP (x, 1)) == CONST) { - rtx unspec, offset, reg = XEXP (x, 0); + rtx unspec, offset; split_const (XEXP (x, 1), &unspec, &offset); if (GET_CODE (unspec) == UNSPEC && !nios2_large_offset_p (XINT (unspec, 1)) && offset != const0_rtx) { + rtx reg = force_reg (Pmode, XEXP (x, 0)); unspec = copy_rtx (unspec); XVECEXP (unspec, 0, 0) = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset)); |