Merge from trunk revision 8dc2499aa62f768c6395c9754b8cabc1ce25c494

22 files changed, 31 insertions, 31 deletions

diff --git a/gcc/config/m32c/addsub.md b/gcc/config/m32c/addsub.md
index fd00773..e3cdc64 100644
--- a/gcc/config/m32c/addsub.md
+++ b/gcc/config/m32c/addsub.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/bitops.md b/gcc/config/m32c/bitops.md
index 8573aeb..7c52436 100644
--- a/gcc/config/m32c/bitops.md
+++ b/gcc/config/m32c/bitops.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/blkmov.md b/gcc/config/m32c/blkmov.md
index c140509..0c13c9b 100644
--- a/gcc/config/m32c/blkmov.md
+++ b/gcc/config/m32c/blkmov.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/cond.md b/gcc/config/m32c/cond.md
index b80b103..2a8a2ab 100644
--- a/gcc/config/m32c/cond.md
+++ b/gcc/config/m32c/cond.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/constraints.md b/gcc/config/m32c/constraints.md
index 5e18821..9545af9 100644
--- a/gcc/config/m32c/constraints.md
+++ b/gcc/config/m32c/constraints.md
@@ -1,5 +1,5 @@
 ;; m32c constraints
-;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
 ;;
 ;; This file is part of GCC.
 ;;
diff --git a/gcc/config/m32c/jump.md b/gcc/config/m32c/jump.md
index 4e93c95..220926d 100644
--- a/gcc/config/m32c/jump.md
+++ b/gcc/config/m32c/jump.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/m32c-modes.def b/gcc/config/m32c/m32c-modes.def
index b5c613c..9132b60 100644
--- a/gcc/config/m32c/m32c-modes.def
+++ b/gcc/config/m32c/m32c-modes.def
@@ -1,5 +1,5 @@
 /* Target-Specific Modes for R8C/M16C/M32C
-   Copyright (C) 2005-2021 Free Software Foundation, Inc.
+   Copyright (C) 2005-2022 Free Software Foundation, Inc.
    Contributed by Red Hat.
 
    This file is part of GCC.
diff --git a/gcc/config/m32c/m32c-pragma.c b/gcc/config/m32c/m32c-pragma.cc
index 54c09e5..c7d01a9 100644
--- a/gcc/config/m32c/m32c-pragma.c
+++ b/gcc/config/m32c/m32c-pragma.cc
@@ -1,5 +1,5 @@
 /* M32C Pragma support
-   Copyright (C) 2004-2021 Free Software Foundation, Inc.
+   Copyright (C) 2004-2022 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of GCC.
@@ -51,14 +51,14 @@ m32c_pragma_memregs (cpp_reader * reader ATTRIBUTE_UNUSED)
 
 	  type = pragma_lex (&val);
 	  if (type != CPP_EOF)
-	    warning (0, "junk at end of #pragma GCC memregs [0..16]");
+	    warning (0, "junk at end of %<#pragma GCC memregs%> [0-16]");
 
 	  if (i >= 0 && i <= 16)
 	    {
 	      if (!ok_to_change_target_memregs)
 		{
 		  warning (0,
-			   "#pragma GCC memregs must precede any function decls");
+			   "%<#pragma GCC memregs%> must precede any function declarations");
 		  return;
 		}
 	      target_memregs = i;
@@ -66,14 +66,14 @@ m32c_pragma_memregs (cpp_reader * reader ATTRIBUTE_UNUSED)
 	    }
 	  else
 	    {
-	      warning (0, "#pragma GCC memregs takes a number [0..16]");
+	      warning (0, "%<#pragma GCC memregs%> takes a number [0-16]");
 	    }
 
 	  return;
 	}
     }
 
-  error ("#pragma GCC memregs takes a number [0..16]");
+  error ("%<#pragma GCC memregs%> takes a number [0-16]");
 }
 
 /* Implements the "pragma ADDRESS" pragma.  This pragma takes a
@@ -101,12 +101,12 @@ m32c_pragma_address (cpp_reader * reader ATTRIBUTE_UNUSED)
 	  type = pragma_lex (&var);
 	  if (type != CPP_EOF)
 	    {
-	      error ("junk at end of #pragma ADDRESS");
+	      error ("junk at end of %<#pragma ADDRESS%>");
 	    }
 	  return;
 	}
     }
-  error ("malformed #pragma ADDRESS variable address");
+  error ("malformed %<#pragma ADDRESS%> variable address");
 }
 
 /* Implements REGISTER_TARGET_PRAGMAS.  */
diff --git a/gcc/config/m32c/m32c-protos.h b/gcc/config/m32c/m32c-protos.h
index bebeff9..2cfed80 100644
--- a/gcc/config/m32c/m32c-protos.h
+++ b/gcc/config/m32c/m32c-protos.h
@@ -1,5 +1,5 @@
 /* Target Prototypes for R8C/M16C/M32C
-   Copyright (C) 2005-2021 Free Software Foundation, Inc.
+   Copyright (C) 2005-2022 Free Software Foundation, Inc.
    Contributed by Red Hat.
 
    This file is part of GCC.
diff --git a/gcc/config/m32c/m32c.abi b/gcc/config/m32c/m32c.abi
index 5f56a95..5db5678 100644
--- a/gcc/config/m32c/m32c.abi
+++ b/gcc/config/m32c/m32c.abi
@@ -1,5 +1,5 @@
    Target Definitions for R8C/M16C/M32C
-   Copyright (C) 2005-2021 Free Software Foundation, Inc.
+   Copyright (C) 2005-2022 Free Software Foundation, Inc.
    Contributed by Red Hat.
 
    This file is part of GCC.
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.cc
index f99e2b0..11ca9a4 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.cc
@@ -1,5 +1,5 @@
 /* Target Code for R8C/M16C/M32C
-   Copyright (C) 2005-2021 Free Software Foundation, Inc.
+   Copyright (C) 2005-2022 Free Software Foundation, Inc.
    Contributed by Red Hat.
 
    This file is part of GCC.
@@ -4044,7 +4044,7 @@ m32c_function_needs_enter (void)
 /* Mark all the subexpressions of the PARALLEL rtx PAR as
    frame-related.  Return PAR.
 
-   dwarf2out.c:dwarf2out_frame_debug_expr ignores sub-expressions of a
+   dwarf2out.cc:dwarf2out_frame_debug_expr ignores sub-expressions of a
    PARALLEL rtx other than the first if they do not have the
    FRAME_RELATED flag set on them.  So this function is handy for
    marking up 'enter' instructions.  */
diff --git a/gcc/config/m32c/m32c.h b/gcc/config/m32c/m32c.h
index 228a73d..af99103 100644
--- a/gcc/config/m32c/m32c.h
+++ b/gcc/config/m32c/m32c.h
@@ -1,5 +1,5 @@
 /* Target Definitions for R8C/M16C/M32C
-   Copyright (C) 2005-2021 Free Software Foundation, Inc.
+   Copyright (C) 2005-2022 Free Software Foundation, Inc.
    Contributed by Red Hat.
 
    This file is part of GCC.
@@ -522,7 +522,7 @@ typedef struct m32c_cumulative_args
 #define MAX_REGS_PER_ADDRESS 1
 
 /* This is passed to the macros below, so that they can be implemented
-   in m32c.c.  */
+   in m32c.cc.  */
 #ifdef REG_OK_STRICT
 #define REG_OK_STRICT_V 1
 #else
diff --git a/gcc/config/m32c/m32c.md b/gcc/config/m32c/m32c.md
index 13aee2a..5574c72 100644
--- a/gcc/config/m32c/m32c.md
+++ b/gcc/config/m32c/m32c.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/m32c.opt b/gcc/config/m32c/m32c.opt
index d414b45..0a03566 100644
--- a/gcc/config/m32c/m32c.opt
+++ b/gcc/config/m32c/m32c.opt
@@ -1,5 +1,5 @@
 ; Target Options for R8C/M16C/M32C
-; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ; Contributed by Red Hat.
 ;
 ; This file is part of GCC.
diff --git a/gcc/config/m32c/minmax.md b/gcc/config/m32c/minmax.md
index e3ff148..f292228 100644
--- a/gcc/config/m32c/minmax.md
+++ b/gcc/config/m32c/minmax.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/mov.md b/gcc/config/m32c/mov.md
index b26ea54..bfa6be0 100644
--- a/gcc/config/m32c/mov.md
+++ b/gcc/config/m32c/mov.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/muldiv.md b/gcc/config/m32c/muldiv.md
index ca2c1b4..466996b 100644
--- a/gcc/config/m32c/muldiv.md
+++ b/gcc/config/m32c/muldiv.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/predicates.md b/gcc/config/m32c/predicates.md
index dae5189..f83601d 100644
--- a/gcc/config/m32c/predicates.md
+++ b/gcc/config/m32c/predicates.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/prologue.md b/gcc/config/m32c/prologue.md
index f4347af..87a7462d 100644
--- a/gcc/config/m32c/prologue.md
+++ b/gcc/config/m32c/prologue.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/rtems.h b/gcc/config/m32c/rtems.h
index 80b69ec..553f77c 100644
--- a/gcc/config/m32c/rtems.h
+++ b/gcc/config/m32c/rtems.h
@@ -1,5 +1,5 @@
 /* Definitions for rtems targeting a M32C using ELF.
-   Copyright (C) 2008-2021 Free Software Foundation, Inc.
+   Copyright (C) 2008-2022 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (joel@OARcorp.com).
 
    This file is part of GCC.
diff --git a/gcc/config/m32c/shift.md b/gcc/config/m32c/shift.md
index c26b637..d891dbb 100644
--- a/gcc/config/m32c/shift.md
+++ b/gcc/config/m32c/shift.md
@@ -1,5 +1,5 @@
 ;; Machine Descriptions for R8C/M16C/M32C
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 ;; Contributed by Red Hat.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/m32c/t-m32c b/gcc/config/m32c/t-m32c
index b637239..8702608 100644
--- a/gcc/config/m32c/t-m32c
+++ b/gcc/config/m32c/t-m32c
@@ -1,5 +1,5 @@
 # Target Makefile Fragment for R8C/M16C/M32C
-# Copyright (C) 2005-2021 Free Software Foundation, Inc.
+# Copyright (C) 2005-2022 Free Software Foundation, Inc.
 # Contributed by Red Hat.
 #
 # This file is part of GCC.
@@ -31,7 +31,7 @@ md : $(MD_FILES:%=$(srcdir)/config/m32c/%.md) $(srcdir)/config/m32c/t-m32c
 	  echo "(include \"$(srcdir)/config/m32c/$$md.md\")"; \
 	done > md
 
-m32c-pragma.o: $(srcdir)/config/m32c/m32c-pragma.c $(RTL_H) $(TREE_H) $(CONFIG_H) $(TM_H)
+m32c-pragma.o: $(srcdir)/config/m32c/m32c-pragma.cc $(RTL_H) $(TREE_H) $(CONFIG_H) $(TM_H)
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $<
 
 # We support four CPU series, but R8C and M16C share one multilib, and