[committed] Fix m68k bootstrap

Message ID a2ffe9c059df3baa6d926ce252bdb31608102a6d.camel@redhat.com
State New
Headers show
Series
  • [committed] Fix m68k bootstrap
Related show

Commit Message

Jakub Jelinek via Gcc-patches July 1, 2020, 4:12 p.m.
Similar to what we've seen elsewhere.  The change to c++17 by default is causing
m68k to not bootstrap due to use of the "register" keyword.  This patch removes
the half-dozen or so instances I immediately saw.  I'll spin up another m68k
bootstrap attempt today/tonight.

Jeff
commit fb43b412502fd975b5ff40aa3cb4b3fdd5d7b39a
Author: Jeff Law <law@redhat.com>
Date:   Wed Jul 1 10:09:48 2020 -0600

    Fix bootstrap for m68k.
    
    gcc/
            * config/m68k/m68k.c (m68k_output_btst): Drop "register" keyword.
            (emit_move_sequence, output_iorsi3, output_xorsi3): Likewise.

Patch

diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 67b109447b3..36a0e34fb06 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -1946,7 +1946,7 @@  m68k_output_btst (rtx countop, rtx dataop, rtx_code code, int signpos)
 
   if (GET_CODE (countop) == CONST_INT)
     {
-      register int count = INTVAL (countop);
+      int count = INTVAL (countop);
       /* If COUNT is bigger than size of storage unit in use,
 	 advance to the containing unit of same size.  */
       if (count > signpos)
@@ -3850,9 +3850,9 @@  fp_reg_operand (rtx op, machine_mode mode ATTRIBUTE_UNUSED)
 int
 emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg)
 {
-  register rtx operand0 = operands[0];
-  register rtx operand1 = operands[1];
-  register rtx tem;
+  rtx operand0 = operands[0];
+  rtx operand1 = operands[1];
+  rtx tem;
 
   if (scratch_reg
       && reload_in_progress && GET_CODE (operand0) == REG
@@ -5474,7 +5474,7 @@  output_andsi3 (rtx *operands)
 const char *
 output_iorsi3 (rtx *operands)
 {
-  register int logval;
+  int logval;
   CC_STATUS_INIT;
   if (GET_CODE (operands[2]) == CONST_INT
       && INTVAL (operands[2]) >> 16 == 0
@@ -5513,7 +5513,7 @@  output_iorsi3 (rtx *operands)
 const char *
 output_xorsi3 (rtx *operands)
 {
-  register int logval;
+  int logval;
   CC_STATUS_INIT;
   if (GET_CODE (operands[2]) == CONST_INT
       && INTVAL (operands[2]) >> 16 == 0