Remove previous Berg change.

From-SVN: r6998

diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 4979dbfd91b7b80f28340d40de022a1c1e53cd44..35d457313594019eeda9ac4fef27161426acaf0b 100644 (file)
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -406,7 +406,11 @@ save_call_clobbered_regs (insn_mode)
         saved because we restore all of them before the end of the basic
         block.  */
 
-      COPY_HARD_REG_SET (hard_regs_live, *regs_live);
+#ifdef HARD_REG_SET
+      hard_regs_live = *regs_live;
+#else
+      COPY_HARD_REG_SET (hard_regs_live, regs_live);
+#endif
 
       CLEAR_HARD_REG_SET (hard_regs_saved);
       CLEAR_HARD_REG_SET (hard_regs_need_restore);

diff --git a/gcc/global.c b/gcc/global.c
index e7ea97754dccebc014770f8e2e50008d632b0966..cbc9f008f37f3734b8527d339fab350ec5cbbf87 100644 (file)
--- a/gcc/global.c
+++ b/gcc/global.c
@@ -625,8 +625,11 @@ global_conflicts ()
        register regset old = basic_block_live_at_start[b];
        int ax = 0;
 
-       COPY_HARD_REG_SET (hard_regs_live, old[0]);
-
+#ifdef HARD_REG_SET
+       hard_regs_live = old[0];
+#else
+       COPY_HARD_REG_SET (hard_regs_live, old);
+#endif
        for (offset = 0, i = 0; offset < regset_size; offset++)
          if (old[offset] == 0)
            i += REGSET_ELT_BITS;

diff --git a/gcc/local-alloc.c b/gcc/local-alloc.c
index 75ffedbcc3f2df29220fa8bc4bf75d70523c0af4..a7b272f8de456912e9113621460b5946df733f68 100644 (file)
--- a/gcc/local-alloc.c
+++ b/gcc/local-alloc.c
@@ -1131,7 +1131,11 @@ block_alloc (b)
 
   /* Initialize table of hardware registers currently live.  */
 
-  COPY_HARD_REG_SET (regs_live, *basic_block_live_at_start[b]);
+#ifdef HARD_REG_SET
+  regs_live = *basic_block_live_at_start[b];
+#else
+  COPY_HARD_REG_SET (regs_live, basic_block_live_at_start[b]);
+#endif
 
   /* This loop scans the instructions of the basic block
      and assigns quantities to registers.

diff --git a/gcc/reorg.c b/gcc/reorg.c
index 3e6ff8ac7c225c33f0e2bc93e2491cb3d3b6a2fd..d4ebbabf84baef5423e08b9acdaeed80deb90dde 100644 (file)
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -2399,7 +2399,11 @@ mark_target_live_regs (target, res)
         marked live, plus live pseudo regs that have been renumbered to
         hard regs.  */
 
-      COPY_HARD_REG_SET (current_live_regs, *regs_live);
+#ifdef HARD_REG_SET
+      current_live_regs = *regs_live;
+#else
+      COPY_HARD_REG_SET (current_live_regs, regs_live);
+#endif
 
       for (offset = 0, i = 0; offset < regset_size; offset++)
        {