From: Gunther Nikl <gnikl@users.sourceforge.net>
Date: Thu, 17 Jun 2010 19:54:16 +0000 (+0000)
Subject: rs6000.c (print_operand): Also use print_operand_address and puts to output the opera... 
X-Git-Tag: releases/gcc-4.6.0~6376
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d398d9033ab546ac985784ed07051b3f22126d91;p=thirdparty%2Fgcc.git

rs6000.c (print_operand): Also use print_operand_address and puts to output the operand for CONST.

	* config/rs6000/rs6000.c (print_operand) <'K'>: Also use
	print_operand_address and puts to output the operand for CONST.

From-SVN: r160945
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31a6b91d3f55..f68d673b2707 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-17  Gunther Nikl  <gnikl@users.sourceforge.net>
+
+	* config/rs6000/rs6000.c (print_operand) <'K'>: Also use
+	print_operand_address and puts to output the operand for CONST.
+
 2010-06-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/44572
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 863e7fa225cd..55dd0a6118b1 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -14885,27 +14885,16 @@ print_operand (FILE *file, rtx x, int code)
       /* X must be a symbolic constant on ELF.  Write an
 	 expression suitable for an 'addi' that adds in the low 16
 	 bits of the MEM.  */
-      if (GET_CODE (x) != CONST)
-	{
-	  print_operand_address (file, x);
-	  fputs ("@l", file);
-	}
-      else
+      if (GET_CODE (x) == CONST)
 	{
 	  if (GET_CODE (XEXP (x, 0)) != PLUS
 	      || (GET_CODE (XEXP (XEXP (x, 0), 0)) != SYMBOL_REF
 		  && GET_CODE (XEXP (XEXP (x, 0), 0)) != LABEL_REF)
 	      || GET_CODE (XEXP (XEXP (x, 0), 1)) != CONST_INT)
 	    output_operand_lossage ("invalid %%K value");
-	  print_operand_address (file, XEXP (XEXP (x, 0), 0));
-	  fputs ("@l", file);
-	  /* For GNU as, there must be a non-alphanumeric character
-	     between 'l' and the number.  The '-' is added by
-	     print_operand() already.  */
-	  if (INTVAL (XEXP (XEXP (x, 0), 1)) >= 0)
-	    fputs ("+", file);
-	  print_operand (file, XEXP (XEXP (x, 0), 1), 0);
 	}
+      print_operand_address (file, x);
+      fputs ("@l", file);
       return;
 
       /* %l is output_asm_label.  */