Remove previous Berg change.

From-SVN: r6998

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);

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;

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.

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++)
 	{