aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Krebbel <Andreas.Krebbel@de.ibm.com>2011-03-22 09:07:26 +0000
committerAndreas Krebbel <krebbel@gcc.gnu.org>2011-03-22 09:07:26 +0000
commitab081dd6234db09f2d8023f1f09777fc8cf10efb (patch)
treead79e23636f85a26823bbfe93e73b5134ce8071b
parent6fd5332b45083b82b5f568906baa1aec743af386 (diff)
downloadgcc-ab081dd6234db09f2d8023f1f09777fc8cf10efb.zip
gcc-ab081dd6234db09f2d8023f1f09777fc8cf10efb.tar.gz
gcc-ab081dd6234db09f2d8023f1f09777fc8cf10efb.tar.bz2
s390.c (s390_delegitimize_address): Fix offset handling for PLTOFF/GOTOFF.
2011-03-22 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> * config/s390/s390.c (s390_delegitimize_address): Fix offset handling for PLTOFF/GOTOFF. From-SVN: r171281
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/s390/s390.c9
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42d2b14..d164a02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-22 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * config/s390/s390.c (s390_delegitimize_address): Fix offset
+ handling for PLTOFF/GOTOFF.
+
2011-03-22 Nick Clifton <nickc@redhat.com>
* config/i386/cygming.h (SUBTARGET_OVERRIDE_OPTIONS): Remove
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 0501298..ab1005a 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -5030,17 +5030,22 @@ s390_delegitimize_address (rtx orig_x)
&& REGNO (XEXP (x, 0)) == PIC_OFFSET_TABLE_REGNUM
&& GET_CODE (XEXP (x, 1)) == CONST)
{
+ HOST_WIDE_INT offset = 0;
+
/* The const operand. */
y = XEXP (XEXP (x, 1), 0);
if (GET_CODE (y) == PLUS
&& GET_CODE (XEXP (y, 1)) == CONST_INT)
- y = XEXP (y, 0);
+ {
+ offset = INTVAL (XEXP (y, 1));
+ y = XEXP (y, 0);
+ }
if (GET_CODE (y) == UNSPEC
&& (XINT (y, 1) == UNSPEC_GOTOFF
|| XINT (y, 1) == UNSPEC_PLTOFF))
- return XVECEXP (y, 0, 0);
+ return plus_constant (XVECEXP (y, 0, 0), offset);
}
if (GET_CODE (x) != MEM)