From: David Edelsohn <dje@gcc.gnu.org>
Date: Tue, 17 Aug 2004 16:20:35 +0000 (-0400)
Subject: Revert 2004-08-16 Stan Shebs <shebs@apple.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=feb3dc8b30eb28ac5c65af85e4ed4c4257733998;p=gcc.git

Revert 2004-08-16 Stan Shebs <shebs@apple.com>

        Revert 2004-08-16  Stan Shebs  <shebs@apple.com>
        * config/rs6000/rs6000.md: Include darwin.md.
        (builtin_setjmp_receiver): Add DImode case.
        * config/rs6000/rs6000.c (rs6000_emit_move): Add DImode case to
        Darwin bits.

From-SVN: r86132
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99a4aab4aa0..47a6ede8992 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-17  David Edelsohn  <edelsohn@gnu.org>
+
+	Revert 2004-08-16  Stan Shebs  <shebs@apple.com>
+	* config/rs6000/rs6000.md: Include darwin.md.
+	(builtin_setjmp_receiver): Add DImode case.
+	* config/rs6000/rs6000.c (rs6000_emit_move): Add DImode case to
+	Darwin bits.
+
 2004-08-17  Dorit Naishlos  <dorit@il.ibm.com>
 
 	* tree-vectorizer.c: New File: loop vectorization on SSAed GIMPLE trees.
@@ -1866,7 +1874,7 @@
 	* config/i386/xmmintrin.h: Include <mm_malloc.h>.
 
 2004-08-03  H.J. Lu  <hongjiu.lu@intel.com>
-	    Tanguy Fautrà <tfautre@pandora.be>
+	    Tanguy Fautrà <tfautre@pandora.be>
 
 	* config/i386/pmm_malloc.h: New file.
 
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index a1760ed0e48..a3a8f34e237 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4319,16 +4319,8 @@ rs6000_emit_move (rtx dest, rtx source, enum machine_mode mode)
 		  return;
 		}
 #endif
-	      if (mode == DImode)
-		{
-		  emit_insn (gen_macho_high_di (target, operands[1]));
-		  emit_insn (gen_macho_low_di (operands[0], target, operands[1]));
-		}
-	      else
-		{
-		  emit_insn (gen_macho_high (target, operands[1]));
-		  emit_insn (gen_macho_low (operands[0], target, operands[1]));
-		}
+	      emit_insn (gen_macho_high (target, operands[1]));
+	      emit_insn (gen_macho_low (operands[0], target, operands[1]));
 	      return;
 	    }
 
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 149adf7e0e7..198291e22b4 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -101,7 +101,6 @@
 (include "8540.md")
 (include "power4.md")
 (include "power5.md")
-(include "darwin.md")
 
 
 ;; Start with fixed-point load and store insns.  Here we put only the more
@@ -10159,12 +10158,8 @@
 				  CODE_LABEL_NUMBER (operands[0]));
       tmplabrtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (tmplab));
 
-      emit_insn (TARGET_64BIT
-	 ? gen_load_macho_picbase_di (picreg, tmplabrtx)
-	 : gen_load_macho_picbase (picreg, tmplabrtx));
-      emit_insn (TARGET_64BIT
-	 ? gen_macho_correct_pic_di (picreg, picreg, picrtx, tmplabrtx)
-	 : gen_macho_correct_pic (picreg, picreg, picrtx, tmplabrtx));
+      emit_insn (gen_load_macho_picbase (picreg, tmplabrtx));
+      emit_insn (gen_macho_correct_pic (picreg, picreg, picrtx, tmplabrtx));
     }
   else
 #endif