* config/sh/sh.c (gen_far_branch, split_branches): Update

	to reflect new prototypes for redirect_jump and invert_jump.
	(sh_insn_length_adjustment): Get rid of const warnings.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7278667..2a43609 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 23 15:08:31 2000  Clinton Popetz  <cpopetz@cygnus.com>
+
+       * config/sh/sh.c (gen_far_branch, split_branches): Update
+       to reflect new prototypes for redirect_jump and invert_jump.
+       (sh_insn_length_adjustment): Get rid of const warnings.
+
 2000-05-23  Kazu Hirata  <kazu@hxi.com>
 
        * invoke.texi (Options for Debugging Your Program or GCC): Update

diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index d4d38d3..f2c4ef0 100644 (file)
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -2654,7 +2654,7 @@ gen_far_branch (bp)
     emit_barrier_after (jump);
   emit_label_after (bp->near_label, insn);
   JUMP_LABEL (jump) = bp->far_label;
-  if (! invert_jump (insn, label))
+  if (! invert_jump (insn, label, 1))
     abort ();
   /* Prevent reorg from undoing our splits.  */
   gen_block_redirect (jump, bp->address += 2, 2);
@@ -3387,7 +3387,7 @@ split_branches (first)
                    bp->insert_place = insn;
                    bp->address = addr;
                  }
-               if (! redirect_jump (insn, label))
+               if (! redirect_jump (insn, label, 1))
                  abort ();
              }
            else
@@ -3450,7 +3450,7 @@ split_branches (first)
                        JUMP_LABEL (insn) = far_label;
                        LABEL_NUSES (far_label)++;
                      }
-                   redirect_jump (insn, NULL_RTX);
+                   redirect_jump (insn, NULL_RTX, 1);
                    far_label = 0;
                  }
              }
@@ -5156,7 +5156,8 @@ sh_insn_length_adjustment (insn)
     {
       int sum = 0;
       rtx body = PATTERN (insn);
-      char *template, c;
+      const char *template;
+      char c;
       int maybe_label = 1;
 
       if (GET_CODE (body) == ASM_INPUT)