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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86132 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99a4aab..47a6ede 100644 (file)
--- 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Ã\83  <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 a1760ed..a3a8f34 100644 (file)
--- 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 149adf7..198291e 100644 (file)
--- 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")
 
 \f
 ;; 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