880-nios2_legitimize_address.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From b0ea54f3f995754881e0ea6651133aa7b58eeaa2 Mon Sep 17 00:00:00 2001
  2. From: cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4>
  3. Date: Tue, 22 Sep 2015 12:23:20 +0000
  4. Subject: [PATCH] nios2_legitimize_address 2015-09-22 Chung-Lin Tang
  5. <cltang@codesourcery.com>
  6. Backport from mainline
  7. 2015-09-22 Chung-Lin Tang <cltang@codesourcery.com>
  8. * config/nios2/nios2.c (nios2_legitimize_address): When handling
  9. 'reg + reloc' cases, allow first operand to be non-REG, and use
  10. force_reg() to enforce address pattern.
  11. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@228013 138bc75d-0d04-0410-961f-82ee72b054a4
  12. Fixes:
  13. http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0ccbb0
  14. [backported to 4.9.3]
  15. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  16. ---
  17. gcc/config/nios2/nios2.c | 4 ++--
  18. 1 file changed, 2 insertions(+), 2 deletions(-)
  19. diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
  20. index 047b615..41dd6f9 100644
  21. --- a/gcc/config/nios2/nios2.c
  22. +++ b/gcc/config/nios2/nios2.c
  23. @@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
  24. Which will be output as '%tls_le(var+48)(r23)' in assembly. */
  25. if (GET_CODE (x) == PLUS
  26. - && GET_CODE (XEXP (x, 0)) == REG
  27. && GET_CODE (XEXP (x, 1)) == CONST)
  28. {
  29. - rtx unspec, offset, reg = XEXP (x, 0);
  30. + rtx unspec, offset;
  31. split_const (XEXP (x, 1), &unspec, &offset);
  32. if (GET_CODE (unspec) == UNSPEC
  33. && !nios2_large_offset_p (XINT (unspec, 1))
  34. && offset != const0_rtx)
  35. {
  36. + rtx reg = force_reg (Pmode, XEXP (x, 0));
  37. unspec = copy_rtx (unspec);
  38. XVECEXP (unspec, 0, 0)
  39. = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
  40. --
  41. 2.5.0