rpms/gcc/devel gcc44-pr40971.patch,1.1,1.2

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3950

Modified Files:
	gcc44-pr40971.patch 
Log Message:
4.4.1-4

gcc44-pr40971.patch:
 config/rs6000/rs6000.c     |   28 ++++++++++++++++++++++++++--
 testsuite/gcc.dg/pr40971.c |   23 +++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

Index: gcc44-pr40971.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr40971.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-pr40971.patch	5 Aug 2009 15:56:25 -0000	1.1
+++ gcc44-pr40971.patch	5 Aug 2009 16:18:07 -0000	1.2
@@ -8,19 +8,12 @@
 
 --- gcc/config/rs6000/rs6000.c.jj	2009-04-27 16:47:29.000000000 +0200
 +++ gcc/config/rs6000/rs6000.c	2009-08-05 16:53:42.000000000 +0200
-@@ -3808,6 +3808,8 @@ rtx
- rs6000_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
- 			   enum machine_mode mode)
+@@ -4490,6 +4490,28 @@ rs6000_legitimize_address (rtx x, rtx ol
  {
+   rtx ret = NULL_RTX;
+   rtx orig_x = x;
 +  unsigned int extra = 0;
 +
-   if (GET_CODE (x) == SYMBOL_REF)
-     {
-       enum tls_model model = SYMBOL_REF_TLS_MODEL (x);
-@@ -3815,10 +3817,32 @@ rs6000_legitimize_address (rtx x, rtx ol
- 	return rs6000_legitimize_tls_address (x, model);
-     }
- 
 +  switch (mode)
 +    {
 +    case DFmode:
@@ -41,17 +34,19 @@
 +    default:
 +      break;
 +    }
-+
-   if (GET_CODE (x) == PLUS
-       && GET_CODE (XEXP (x, 0)) == REG
-       && GET_CODE (XEXP (x, 1)) == CONST_INT
--      && (unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000) >= 0x10000
-+      && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
-+	  >= 0x10000 - extra)
-       && !((TARGET_POWERPC64
- 	    && (mode == DImode || mode == TImode)
- 	    && (INTVAL (XEXP (x, 1)) & 3) != 0)
-@@ -3831,10 +3855,12 @@ rs6000_legitimize_address (rtx x, rtx ol
+ 
+   if (GET_CODE (x) == SYMBOL_REF)
+     {
+@@ -4512,7 +4534,7 @@ rs6000_legitimize_address (rtx x, rtx ol
+ 	   && GET_CODE (XEXP (x, 0)) == REG
+ 	   && GET_CODE (XEXP (x, 1)) == CONST_INT
+ 	   && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
+-	       >= 0x10000)
++	       >= 0x10000 - extra)
+ 	   && !((TARGET_POWERPC64
+ 		 && (mode == DImode || mode == TImode)
+ 		 && (INTVAL (XEXP (x, 1)) & 3) != 0)
+@@ -4524,10 +4546,12 @@ rs6000_legitimize_address (rtx x, rtx ol
        HOST_WIDE_INT high_int, low_int;
        rtx sum;
        low_int = ((INTVAL (XEXP (x, 1)) & 0xffff) ^ 0x8000) - 0x8000;
@@ -60,8 +55,8 @@
        high_int = INTVAL (XEXP (x, 1)) - low_int;
        sum = force_operand (gen_rtx_PLUS (Pmode, XEXP (x, 0),
  					 GEN_INT (high_int)), 0);
--      return gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
-+      return plus_constant (sum, low_int);
+-      ret = gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
++      ret = plus_constant (sum, low_int);
      }
    else if (GET_CODE (x) == PLUS
  	   && GET_CODE (XEXP (x, 0)) == REG