[PATCH] contrib: add contrib to update-copyright.py script

[PATCH] contrib: add contrib to update-copyright.py script

[Martin Liška]

[-- Attachment #1: Type: text/plain, Size: 2131 bytes --]

Hi.

I would like to automatically update copyright in contrib folder.
The updated version of copyright can be seen in attachment and can be done
at the beginning of the next year.

Thoughts?

Cheers,
Martin

contrib/ChangeLog:

	* update-copyright.py: Add contrib folder.
---
 contrib/update-copyright.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
index 76614ffc4ea..5c4fc512488 100755
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -680,6 +680,18 @@ class LibStdCxxFilter (GenericFilter):
             return re.compile ('// \(C\) Copyright Jeremy Siek')
         return GenericFilter.get_line_filter (self, dir, filename)
 
+class ContribFilder(GenericFilter):
+    def __init__ (self):
+        GenericFilter.__init__ (self)
+
+        self.skip_files |= set ([
+                # A different copyrights.
+                'unicode-license.txt',
+                'Info.plist',
+                # Contains CR (^M).
+                'repro_fail',
+                ])
+
 class GCCCopyright (Copyright):
     def __init__ (self, errors):
         Copyright.__init__ (self, errors)
@@ -699,6 +711,7 @@ class GCCCopyright (Copyright):
         self.add_external_author ('Advanced Micro Devices Inc.')
         self.add_external_author ('Ami Tavory and Vladimir Dreizin, IBM-HRL.')
         self.add_external_author ('Cavium Networks.')
+        self.add_external_author ('David Malcolm')
         self.add_external_author ('Faraday Technology Corp.')
         self.add_external_author ('Florida State University')
         self.add_external_author ('Gerard Jungman')
@@ -738,7 +751,7 @@ class GCCCmdLine (CmdLine):
         # boehm-gc is imported from upstream.
         self.add_dir ('c++tools')
         self.add_dir ('config', ConfigFilter())
-        # contrib isn't really part of GCC.
+        self.add_dir ('contrib', ContribFilder())
         self.add_dir ('fixincludes')
         self.add_dir ('gcc', GCCFilter())
         self.add_dir (os.path.join ('gcc', 'testsuite'), TestsuiteFilter())
-- 
2.38.1

[-- Attachment #2: 0001-Update-copyright-years.patch --]
[-- Type: text/x-patch, Size: 41979 bytes --]

From e3752f59397746b3d558e7f7438302dac67d57b5 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Wed, 14 Dec 2022 14:08:04 +0100
Subject: [PATCH] Update copyright years.

---
 contrib/analyze_brprob.py                                 | 2 +-
 contrib/analyze_brprob_spec.py                            | 2 +-
 contrib/bench-stringop                                    | 2 +-
 contrib/check-params-in-docs.py                           | 2 +-
 contrib/check_GNU_style.py                                | 2 +-
 contrib/check_GNU_style.sh                                | 2 +-
 contrib/check_GNU_style_lib.py                            | 2 +-
 contrib/check_makefile_deps.sh                            | 2 +-
 contrib/check_warning_flags.sh                            | 2 +-
 contrib/clang-format                                      | 2 +-
 contrib/compare-all-tests                                 | 2 +-
 contrib/compare-debug                                     | 2 +-
 contrib/compare-lto                                       | 2 +-
 contrib/compareSumTests3                                  | 2 +-
 contrib/compare_two_ftime_report_sets                     | 2 +-
 contrib/dg-cmp-results.sh                                 | 2 +-
 contrib/dg-extract-results.py                             | 2 +-
 contrib/dg-extract-results.sh                             | 2 +-
 contrib/dglib.pm                                          | 2 +-
 contrib/download_prerequisites                            | 2 +-
 contrib/filter-clang-warnings.py                          | 2 +-
 contrib/gcc-changelog/git_check_commit.py                 | 2 +-
 contrib/gcc-changelog/git_commit.py                       | 2 +-
 contrib/gcc-changelog/git_email.py                        | 2 +-
 contrib/gcc-changelog/git_repository.py                   | 2 +-
 contrib/gcc-changelog/git_update_version.py               | 2 +-
 contrib/gcc-changelog/test_email.py                       | 2 +-
 contrib/gcc_build                                         | 2 +-
 contrib/gen_autofdo_event.py                              | 2 +-
 contrib/git-backport.py                                   | 2 +-
 contrib/git-commit-mklog.py                               | 2 +-
 contrib/git-fix-changelog.py                              | 2 +-
 contrib/jit-coverage-report.py                            | 2 +-
 contrib/legacy/mklog                                      | 2 +-
 contrib/legacy/mklog.pl                                   | 2 +-
 contrib/mark_spam.py                                      | 2 +-
 contrib/mklog.py                                          | 2 +-
 contrib/patch_tester.sh                                   | 2 +-
 contrib/prepare-commit-msg                                | 2 +-
 contrib/prepare_patch.sh                                  | 2 +-
 contrib/reghunt/bin/gcc-build-full                        | 2 +-
 contrib/reghunt/bin/gcc-build-simple                      | 2 +-
 contrib/reghunt/bin/gcc-svn-patchlist                     | 2 +-
 contrib/reghunt/bin/gcc-svn-update                        | 2 +-
 contrib/reghunt/bin/gcc-test-accepts-invalid              | 2 +-
 contrib/reghunt/bin/gcc-test-bogus-warning                | 2 +-
 contrib/reghunt/bin/gcc-test-compiler-hangs               | 2 +-
 contrib/reghunt/bin/gcc-test-ice-on-invalid-code          | 2 +-
 contrib/reghunt/bin/gcc-test-ice-on-valid-code            | 2 +-
 contrib/reghunt/bin/gcc-test-missing-warning              | 2 +-
 contrib/reghunt/bin/gcc-test-rejects-valid                | 2 +-
 contrib/reghunt/bin/gcc-test-segfault-on-valid-code       | 2 +-
 contrib/reghunt/bin/gcc-test-wrong-code                   | 2 +-
 contrib/reghunt/bin/reg-hunt                              | 2 +-
 contrib/reghunt/bin/reg-newmid                            | 2 +-
 contrib/reghunt/bin/reg-test                              | 2 +-
 contrib/reghunt/date_based/reg_periodic                   | 2 +-
 contrib/reghunt/date_based/reg_search                     | 2 +-
 contrib/regression/GCC_Regression_Tester.wdgt/widget.html | 2 +-
 contrib/regression/btest-gcc.sh                           | 3 +--
 contrib/regression/mkindex.pl                             | 2 +-
 contrib/regression/objs-gcc.sh                            | 3 +--
 contrib/test_installed                                    | 2 +-
 contrib/test_mklog.py                                     | 6 +++---
 contrib/testsuite-management/validate_failures.py         | 2 +-
 contrib/texi2pod.pl                                       | 2 +-
 contrib/unicode/from_glibc/unicode_utils.py               | 2 +-
 contrib/unicode/from_glibc/utf8_gen.py                    | 2 +-
 contrib/unused_functions.py                               | 2 +-
 contrib/vim-gcc-dev/ftdetect/gcc-dev.vim                  | 2 +-
 contrib/vim-gcc-dev/syntax/gcc-match.vim                  | 2 +-
 contrib/vim-gcc-dev/syntax/gcc-rtl.vim                    | 2 +-
 contrib/vim-gcc-dev/syntax/gimple.vim                     | 2 +-
 contrib/vimrc                                             | 2 +-
 74 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/contrib/analyze_brprob.py b/contrib/analyze_brprob.py
index d5a8031e75c..33b5dca845f 100755
--- a/contrib/analyze_brprob.py
+++ b/contrib/analyze_brprob.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2022 Free Software Foundation, Inc.
 #
 # Script to analyze results of our branch prediction heuristics
 #
diff --git a/contrib/analyze_brprob_spec.py b/contrib/analyze_brprob_spec.py
index 8f7dcbaddb4..93366359dbf 100755
--- a/contrib/analyze_brprob_spec.py
+++ b/contrib/analyze_brprob_spec.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/bench-stringop b/contrib/bench-stringop
index 7af8bfd96a0..c8e57a71682 100755
--- a/contrib/bench-stringop
+++ b/contrib/bench-stringop
@@ -4,7 +4,7 @@
 #
 # Contributed by Jan Hubicka <jh@suse.cz>
 #
-# Copyright (C) 2019 Free Software Foundation, Inc.
+# Copyright (C) 2019-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/check-params-in-docs.py b/contrib/check-params-in-docs.py
index 8f8f6654df3..d25933cea9f 100755
--- a/contrib/check-params-in-docs.py
+++ b/contrib/check-params-in-docs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022 Free Software Foundation, Inc.
 #
 # Find missing and extra parameters in documentation compared to
 # output of: gcc --help=params.
diff --git a/contrib/check_GNU_style.py b/contrib/check_GNU_style.py
index 826d17abf08..6a047ded48c 100755
--- a/contrib/check_GNU_style.py
+++ b/contrib/check_GNU_style.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# Copyright (C) 2017-2022 Free Software Foundation, Inc.
 #
 # Checks some of the GNU style formatting rules in a set of patches.
 # The script is a rewritten of the same bash script and should eventually
diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh
index fb7494661ee..fbfe56572b7 100755
--- a/contrib/check_GNU_style.sh
+++ b/contrib/check_GNU_style.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Checks some of the GNU style formatting rules in a set of patches.
-# Copyright (C) 2010, 2012, 2016  Free Software Foundation, Inc.
+# Copyright (C) 2010-2022 Free Software Foundation, Inc.
 # Contributed by Sebastian Pop <sebastian.pop@amd.com>
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/contrib/check_GNU_style_lib.py b/contrib/check_GNU_style_lib.py
index 3d709d1eafa..a487863fd03 100755
--- a/contrib/check_GNU_style_lib.py
+++ b/contrib/check_GNU_style_lib.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# Copyright (C) 2017-2022 Free Software Foundation, Inc.
 #
 # Checks some of the GNU style formatting rules in a set of patches.
 # The script is a rewritten of the same bash script and should eventually
diff --git a/contrib/check_makefile_deps.sh b/contrib/check_makefile_deps.sh
index fd739a114b1..c092ba02a97 100644
--- a/contrib/check_makefile_deps.sh
+++ b/contrib/check_makefile_deps.sh
@@ -2,7 +2,7 @@
 #
 # Check for accurate dependencies in gcc/Makefile.in.
 #
-# Copyright (C) 2008, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2022 Free Software Foundation, Inc.
 # Written by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
 #
 # This script is Free Software, and it can be copied, distributed and
diff --git a/contrib/check_warning_flags.sh b/contrib/check_warning_flags.sh
index d9c5735abf8..3cc30908a87 100755
--- a/contrib/check_warning_flags.sh
+++ b/contrib/check_warning_flags.sh
@@ -3,7 +3,7 @@
 # Check that the warning flags documented in invoke.texi match up
 # with what the compiler accepts.
 #
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-2022 Free Software Foundation, Inc.
 # Written by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
 #
 # This script is Free Software, and it can be copied, distributed and
diff --git a/contrib/clang-format b/contrib/clang-format
index 57cec1e6947..f91f03dc0ef 100644
--- a/contrib/clang-format
+++ b/contrib/clang-format
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2015-2022 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/compare-all-tests b/contrib/compare-all-tests
index 502cc64f522..8ac59433bd9 100644
--- a/contrib/compare-all-tests
+++ b/contrib/compare-all-tests
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # Compare the assembly language output for all the gcc tests.
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2022 Free Software Foundation, Inc.
 # Contributed by Paolo Bonzini.
 #
 # Invoke it as "bash compare-all-tests target1 target2 ... targetN".
diff --git a/contrib/compare-debug b/contrib/compare-debug
index cf80ae32695..aec318aca81 100755
--- a/contrib/compare-debug
+++ b/contrib/compare-debug
@@ -2,7 +2,7 @@
 
 # Compare stripped copies of two given object files.
 
-# Copyright (C) 2007, 2008, 2009, 2010, 2012, 2020 Free Software Foundation
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 # Originally by Alexandre Oliva <aoliva@redhat.com>
 
 # This file is part of GCC.
diff --git a/contrib/compare-lto b/contrib/compare-lto
index c0bb71c0765..38885a66c76 100755
--- a/contrib/compare-lto
+++ b/contrib/compare-lto
@@ -2,7 +2,7 @@
 
 # Compare copies of two given object files.
 
-# Copyright (C) 2007, 2008, 2009, 2010, 2012 Free Software Foundation
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 # Originally by Alexandre Oliva <aoliva@redhat.com>
 # Modified for LTO bootstrap by Richard Biener <rguenther@suse.de>
 
diff --git a/contrib/compareSumTests3 b/contrib/compareSumTests3
index 64f35d74ee7..3148982416d 100755
--- a/contrib/compareSumTests3
+++ b/contrib/compareSumTests3
@@ -5,7 +5,7 @@
 #
 # Author: Matthew Sachs <msachs@apple.com>
 #
-# Copyright (c) 2006 Free Software Foundation.
+# Copyright (C) 2006-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/compare_two_ftime_report_sets b/contrib/compare_two_ftime_report_sets
index 384dfde1d25..541edf9f187 100755
--- a/contrib/compare_two_ftime_report_sets
+++ b/contrib/compare_two_ftime_report_sets
@@ -5,7 +5,7 @@
 
 # Contributed by Lawrence Crowl <crowl@google.com>
 #
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh
index eb976f68f4a..9fbc5db54b5 100755
--- a/contrib/dg-cmp-results.sh
+++ b/contrib/dg-cmp-results.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006-2022 Free Software Foundation, Inc.
 #
 # Analyze changes in GCC DejaGNU test logs for binutils, gcc, gdb, etc.
 # Original version written in 2005 by James Lemke <jwlemke@wasabisystems.com>.
diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py
index 30aa68771d4..79f08ad3798 100644
--- a/contrib/dg-extract-results.py
+++ b/contrib/dg-extract-results.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014-2022 Free Software Foundation, Inc.
 #
 # This script is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh
index ff6c50d029c..26e57477459 100755
--- a/contrib/dg-extract-results.sh
+++ b/contrib/dg-extract-results.sh
@@ -6,7 +6,7 @@
 # The resulting file can be used with test result comparison scripts for
 # results from tests that were run in parallel.  See usage() below.
 
-# Copyright (C) 2008, 2009, 2010, 2012 Free Software Foundation
+# Copyright (C) 2008-2022 Free Software Foundation, Inc.
 # Contributed by Janis Johnson <janis187@us.ibm.com>
 #
 # This file is part of GCC.
diff --git a/contrib/dglib.pm b/contrib/dglib.pm
index c86d4f01481..4cc5c1816c5 100644
--- a/contrib/dglib.pm
+++ b/contrib/dglib.pm
@@ -10,7 +10,7 @@
 #		true if and only if it is a passing result (PASS, XFAIL, or
 #		KFAIL.)
 #
-# Copyright (c) 2006 Free Software Foundation.
+# Copyright (C) 2006-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites
index 5c90d889bc6..f207564af6d 100755
--- a/contrib/download_prerequisites
+++ b/contrib/download_prerequisites
@@ -77,7 +77,7 @@ The following options are available:
 "
 
 versiontext="${program} ${version}
-Copyright (C) 2016-2021 Free Software Foundation, Inc.
+Copyright (C) 2016-2022 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
diff --git a/contrib/filter-clang-warnings.py b/contrib/filter-clang-warnings.py
index c426bce5eb5..9dd6ee6d4c9 100755
--- a/contrib/filter-clang-warnings.py
+++ b/contrib/filter-clang-warnings.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022 Free Software Foundation, Inc.
 #
 # Script to analyze warnings produced by clang.
 #
diff --git a/contrib/gcc-changelog/git_check_commit.py b/contrib/gcc-changelog/git_check_commit.py
index 2e3e8cbeb77..0322e8929d1 100755
--- a/contrib/gcc-changelog/git_check_commit.py
+++ b/contrib/gcc-changelog/git_check_commit.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 66d68de03a5..d6dd0277c42 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py
index ef50ebfb7fd..3086c445f76 100755
--- a/contrib/gcc-changelog/git_email.py
+++ b/contrib/gcc-changelog/git_email.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gcc-changelog/git_repository.py b/contrib/gcc-changelog/git_repository.py
index 7c2dc218775..7b2e658f500 100755
--- a/contrib/gcc-changelog/git_repository.py
+++ b/contrib/gcc-changelog/git_repository.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 69c3d2a0633..da220ce0a95 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py
index 89960d307c9..7b98d01e014 100755
--- a/contrib/gcc-changelog/test_email.py
+++ b/contrib/gcc-changelog/test_email.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gcc_build b/contrib/gcc_build
index 6713066d7ce..544d94195a7 100755
--- a/contrib/gcc_build
+++ b/contrib/gcc_build
@@ -11,7 +11,7 @@
 # Contents:
 #   Script to automatically download and build GCC.
 #
-# Copyright (c) 2000, 2001, 2003, 2005 Free Software Foundation.
+# Copyright (C) 2000-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/gen_autofdo_event.py b/contrib/gen_autofdo_event.py
index 7da2876530d..dba369888b0 100755
--- a/contrib/gen_autofdo_event.py
+++ b/contrib/gen_autofdo_event.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # Generate Intel taken branches Linux perf event script for autofdo profiling.
 
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2022 Free Software Foundation, Inc.
 #
 # GCC is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
diff --git a/contrib/git-backport.py b/contrib/git-backport.py
index fc369d97754..10679be66cb 100755
--- a/contrib/git-backport.py
+++ b/contrib/git-backport.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/git-commit-mklog.py b/contrib/git-commit-mklog.py
index c7e90c8262f..47390d30da0 100755
--- a/contrib/git-commit-mklog.py
+++ b/contrib/git-commit-mklog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/git-fix-changelog.py b/contrib/git-fix-changelog.py
index c15e45c11fa..8fe59edaecd 100755
--- a/contrib/git-fix-changelog.py
+++ b/contrib/git-fix-changelog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/jit-coverage-report.py b/contrib/jit-coverage-report.py
index 529336f59fb..908d7b77776 100644
--- a/contrib/jit-coverage-report.py
+++ b/contrib/jit-coverage-report.py
@@ -4,7 +4,7 @@
 # cases, and which lack test coverage.  Tested with Python 2.7 and 3.2
 # To be run from the root directory of the source tree.
 #
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014-2022 Free Software Foundation, Inc.
 # Written by David Malcolm <dmalcolm@redhat.com>.
 #
 # This script is Free Software, and it can be copied, distributed and
diff --git a/contrib/legacy/mklog b/contrib/legacy/mklog
index 71fd427ff61..6770828a251 100755
--- a/contrib/legacy/mklog
+++ b/contrib/legacy/mklog
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2017-2019 Free Software Foundation, Inc.
+# Copyright (C) 2017-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/legacy/mklog.pl b/contrib/legacy/mklog.pl
index ff20cf1ba0f..464a5fbd9ca 100755
--- a/contrib/legacy/mklog.pl
+++ b/contrib/legacy/mklog.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/mark_spam.py b/contrib/mark_spam.py
index a7dc5a2e782..dcd01a9a5a7 100755
--- a/contrib/mark_spam.py
+++ b/contrib/mark_spam.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2022 Free Software Foundation, Inc.
 #
 # Script to mark bunch of PRs as spam 
 #
diff --git a/contrib/mklog.py b/contrib/mklog.py
index 5dea8a05c0c..c7e1742970d 100755
--- a/contrib/mklog.py
+++ b/contrib/mklog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/patch_tester.sh b/contrib/patch_tester.sh
index 56bb1ebf9b7..6e8d345325b 100755
--- a/contrib/patch_tester.sh
+++ b/contrib/patch_tester.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Tests a set of patches from a directory.
-# Copyright (C) 2007, 2008, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 # Contributed by Sebastian Pop <sebastian.pop@amd.com>
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/contrib/prepare-commit-msg b/contrib/prepare-commit-msg
index 969847df6f4..c11c05c44a5 100755
--- a/contrib/prepare-commit-msg
+++ b/contrib/prepare-commit-msg
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/prepare_patch.sh b/contrib/prepare_patch.sh
index 8385f315cc3..c06d5919ddd 100755
--- a/contrib/prepare_patch.sh
+++ b/contrib/prepare_patch.sh
@@ -2,7 +2,7 @@
 #set -x
 
 # Prepares a patch for the patch tester.
-# Copyright (C) 2007  Free Software Foundation, Inc.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 # Contributed by Sebastian Pop <sebastian.pop@amd.com>
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/contrib/reghunt/bin/gcc-build-full b/contrib/reghunt/bin/gcc-build-full
index 21e6d684fed..d72f18c18bd 100755
--- a/contrib/reghunt/bin/gcc-build-full
+++ b/contrib/reghunt/bin/gcc-build-full
@@ -3,7 +3,7 @@
 # Perform a simple build of GCC for a particular language, using several
 # environment variables defined by reghunt scripts and config files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-build-simple b/contrib/reghunt/bin/gcc-build-simple
index f2d8ea39cc6..283c9572891 100755
--- a/contrib/reghunt/bin/gcc-build-simple
+++ b/contrib/reghunt/bin/gcc-build-simple
@@ -5,7 +5,7 @@
 #
 # This doesn't work for sources earlier than about 2003-02-25.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-svn-patchlist b/contrib/reghunt/bin/gcc-svn-patchlist
index 02b2046a8f0..15173fad40b 100755
--- a/contrib/reghunt/bin/gcc-svn-patchlist
+++ b/contrib/reghunt/bin/gcc-svn-patchlist
@@ -4,7 +4,7 @@
 # by default) between the specified dates.  This skips commits that do
 # not modify any existing files and changes by gccadmin.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-svn-update b/contrib/reghunt/bin/gcc-svn-update
index 0f6aac86675..fd0b481854e 100755
--- a/contrib/reghunt/bin/gcc-svn-update
+++ b/contrib/reghunt/bin/gcc-svn-update
@@ -3,7 +3,7 @@
 # Update or check out GCC sources for a particular Subversion revision
 # and a particular branch.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-accepts-invalid b/contrib/reghunt/bin/gcc-test-accepts-invalid
index 564c0bbd7c4..0f8d5cca906 100755
--- a/contrib/reghunt/bin/gcc-test-accepts-invalid
+++ b/contrib/reghunt/bin/gcc-test-accepts-invalid
@@ -3,7 +3,7 @@
 # Test an "accepts-invalid" GCC bug, using environment variables set in
 # several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-bogus-warning b/contrib/reghunt/bin/gcc-test-bogus-warning
index 1bd0095ba98..fc93096850e 100755
--- a/contrib/reghunt/bin/gcc-test-bogus-warning
+++ b/contrib/reghunt/bin/gcc-test-bogus-warning
@@ -3,7 +3,7 @@
 # Test a "bogus-warning" GCC bug, using environment variables set in
 # several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-compiler-hangs b/contrib/reghunt/bin/gcc-test-compiler-hangs
index 043bc26991b..ff13c7670ba 100755
--- a/contrib/reghunt/bin/gcc-test-compiler-hangs
+++ b/contrib/reghunt/bin/gcc-test-compiler-hangs
@@ -3,7 +3,7 @@
 # Test a bug for which the compiler hangs, using environment variables
 # set in several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-ice-on-invalid-code b/contrib/reghunt/bin/gcc-test-ice-on-invalid-code
index 6e449a84ac3..2701e76f729 100755
--- a/contrib/reghunt/bin/gcc-test-ice-on-invalid-code
+++ b/contrib/reghunt/bin/gcc-test-ice-on-invalid-code
@@ -3,7 +3,7 @@
 # Test an "ice-on-invalid-code" GCC bug, using environment variables set
 # in several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-ice-on-valid-code b/contrib/reghunt/bin/gcc-test-ice-on-valid-code
index ecc5fe04afc..396f368a343 100755
--- a/contrib/reghunt/bin/gcc-test-ice-on-valid-code
+++ b/contrib/reghunt/bin/gcc-test-ice-on-valid-code
@@ -3,7 +3,7 @@
 # Test an "ice-on-valid-code" GCC bug, using environment variables set
 # in several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-missing-warning b/contrib/reghunt/bin/gcc-test-missing-warning
index 0fc9b2dc8ea..5899a0adb5d 100755
--- a/contrib/reghunt/bin/gcc-test-missing-warning
+++ b/contrib/reghunt/bin/gcc-test-missing-warning
@@ -3,7 +3,7 @@
 # Test a "missing-warning" GCC bug, using environment variables set in
 # several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-rejects-valid b/contrib/reghunt/bin/gcc-test-rejects-valid
index 5672a0dfee6..451903199c9 100755
--- a/contrib/reghunt/bin/gcc-test-rejects-valid
+++ b/contrib/reghunt/bin/gcc-test-rejects-valid
@@ -3,7 +3,7 @@
 # Test a "rejects-valid" GCC bug, using environment variables set in
 # several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-segfault-on-valid-code b/contrib/reghunt/bin/gcc-test-segfault-on-valid-code
index 0a1b1b722b5..19e94c139ac 100755
--- a/contrib/reghunt/bin/gcc-test-segfault-on-valid-code
+++ b/contrib/reghunt/bin/gcc-test-segfault-on-valid-code
@@ -4,7 +4,7 @@
 # segfault, using environment variables set in several reghunt scripts
 # and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/gcc-test-wrong-code b/contrib/reghunt/bin/gcc-test-wrong-code
index 2c0398beac7..c0d40b78496 100755
--- a/contrib/reghunt/bin/gcc-test-wrong-code
+++ b/contrib/reghunt/bin/gcc-test-wrong-code
@@ -3,7 +3,7 @@
 # Test a "wrong-code" GCC bug, using environment variables set in
 # several reghunt scripts and configuration files.
 #
-# Copyright (C) 2007 Free Software Foundation.
+# Copyright (C) 2007-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/reg-hunt b/contrib/reghunt/bin/reg-hunt
index aa0ea61ee22..c4061c4d314 100755
--- a/contrib/reghunt/bin/reg-hunt
+++ b/contrib/reghunt/bin/reg-hunt
@@ -47,7 +47,7 @@
 #
 #
 #
-# Copyright (c) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/reg-newmid b/contrib/reghunt/bin/reg-newmid
index 2a6b57362ba..8fad04466d4 100755
--- a/contrib/reghunt/bin/reg-newmid
+++ b/contrib/reghunt/bin/reg-newmid
@@ -10,7 +10,7 @@
 # A nifty improvement would be to record known ranges of failure as
 # ranges, and then pick revisions just before and just after the range.
 #
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/bin/reg-test b/contrib/reghunt/bin/reg-test
index 622a6546150..e2f1652d29a 100755
--- a/contrib/reghunt/bin/reg-test
+++ b/contrib/reghunt/bin/reg-test
@@ -25,7 +25,7 @@
 #               is STOP in the current directory.
 #
 #
-# Copyright (c) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/date_based/reg_periodic b/contrib/reghunt/date_based/reg_periodic
index a77567d4d5b..ebf85a9eb4b 100755
--- a/contrib/reghunt/date_based/reg_periodic
+++ b/contrib/reghunt/date_based/reg_periodic
@@ -25,7 +25,7 @@
 #               is STOP in the current directory.
 #
 #
-# Copyright (c) 2002, 2003, 2005, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/reghunt/date_based/reg_search b/contrib/reghunt/date_based/reg_search
index 46602054d79..70473a457b6 100755
--- a/contrib/reghunt/date_based/reg_search
+++ b/contrib/reghunt/date_based/reg_search
@@ -45,7 +45,7 @@
 #
 #
 #
-# Copyright (c) 2002, 2003, 2005, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/regression/GCC_Regression_Tester.wdgt/widget.html b/contrib/regression/GCC_Regression_Tester.wdgt/widget.html
index ec24fb54ad3..51487639202 100644
--- a/contrib/regression/GCC_Regression_Tester.wdgt/widget.html
+++ b/contrib/regression/GCC_Regression_Tester.wdgt/widget.html
@@ -1,5 +1,5 @@
 <!-- Get and update the GCC regression tester's web page.
-     Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+     Copyright (C) 2005-2022 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/contrib/regression/btest-gcc.sh b/contrib/regression/btest-gcc.sh
index d4966dc6c40..0c2fae71f36 100755
--- a/contrib/regression/btest-gcc.sh
+++ b/contrib/regression/btest-gcc.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 #  Test GCC.
-#  Copyright (C) 1999, 2000, 2001, 2002, 2005, 2006, 2009, 2012
-#  Free Software Foundation, Inc.
+#  Copyright (C) 1999-2022 Free Software Foundation, Inc.
 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/contrib/regression/mkindex.pl b/contrib/regression/mkindex.pl
index 46e11069f09..baaccf82247 100755
--- a/contrib/regression/mkindex.pl
+++ b/contrib/regression/mkindex.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Copy log files from a GCC build for HTTP access.
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2022 Free Software Foundation, Inc.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
index 60b0497fea2..52d47af1773 100755
--- a/contrib/regression/objs-gcc.sh
+++ b/contrib/regression/objs-gcc.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 #  Build tools for testing GCC.
-#  Copyright (C) 1999, 2000, 2001, 2002, 2009
-#  Free Software Foundation, Inc.
+#  Copyright (C) 1999-2022 Free Software Foundation, Inc.
 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/contrib/test_installed b/contrib/test_installed
index 54a8396bb46..e960550bc47 100755
--- a/contrib/test_installed
+++ b/contrib/test_installed
@@ -60,7 +60,7 @@ while true; do
 
   --help) cat <<\EOF
 Runs the testsuite for an installed version of gcc/g++/gfortran/objc
-Copyright (C) 1998  Free Software Foundation
+Copyright (C) 1998-2022 Free Software Foundation, Inc.
 by Alexandre Oliva <oliva@dcc.unicamp.br>
 
 Supported arguments:
diff --git a/contrib/test_mklog.py b/contrib/test_mklog.py
index bf2f280b46e..4a0a7fab835 100755
--- a/contrib/test_mklog.py
+++ b/contrib/test_mklog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
@@ -155,7 +155,7 @@ index aab79492357..f0df1002488 100644
 +
 +
  /* Interprocedural Identical Code Folding pass
-    Copyright (C) 2014-2020 Free Software Foundation, Inc.
+    Copyright (C) 2014-2022 Free Software Foundation, Inc.
  
 diff --git a/gcc/testsuite/gcc.dg/pr32374.c b/gcc/testsuite/gcc.dg/pr32374.c
 deleted file mode 100644
@@ -222,7 +222,7 @@ index f062e48071f..fd3c7ca8cf3 100644
 +
 +
  /* Output variables, constants and external declarations, for GNU compiler.
-    Copyright (C) 1987-2020 Free Software Foundation, Inc.
+    Copyright (C) 1987-2022 Free Software Foundation, Inc.
  
 diff --git a/libssp/gets-chk.c b/libssp/gets-chk.c
 index 4ad78c1f77b..6687b368038 100644
diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py
index 925ba22ea0f..c2727714050 100755
--- a/contrib/testsuite-management/validate_failures.py
+++ b/contrib/testsuite-management/validate_failures.py
@@ -5,7 +5,7 @@
 
 # Contributed by Diego Novillo <dnovillo@google.com>
 #
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2022 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
diff --git a/contrib/texi2pod.pl b/contrib/texi2pod.pl
index 5fcf0a1c940..b72acaf4f0d 100755
--- a/contrib/texi2pod.pl
+++ b/contrib/texi2pod.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-#   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#   Copyright (C) 1999-2022 Free Software Foundation, Inc.
 
 # This file is part of GCC.
 
diff --git a/contrib/unicode/from_glibc/unicode_utils.py b/contrib/unicode/from_glibc/unicode_utils.py
index 292901d3ab1..a7d11af809c 100644
--- a/contrib/unicode/from_glibc/unicode_utils.py
+++ b/contrib/unicode/from_glibc/unicode_utils.py
@@ -1,6 +1,6 @@
 # Utilities to generate Unicode data for glibc from upstream Unicode data.
 #
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2022 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 # The GNU C Library is free software; you can redistribute it and/or
diff --git a/contrib/unicode/from_glibc/utf8_gen.py b/contrib/unicode/from_glibc/utf8_gen.py
index 11c906b92fe..5747e7024f3 100755
--- a/contrib/unicode/from_glibc/utf8_gen.py
+++ b/contrib/unicode/from_glibc/utf8_gen.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2022 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 # The GNU C Library is free software; you can redistribute it and/or
diff --git a/contrib/unused_functions.py b/contrib/unused_functions.py
index bf7cf36854a..6a1aeeeb66f 100755
--- a/contrib/unused_functions.py
+++ b/contrib/unused_functions.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2018 Free Software Foundation
+# Copyright (C) 2018-2022 Free Software Foundation, Inc.
 # Contributed by Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
 # Inspired by bloat-o-meter from busybox.
 
diff --git a/contrib/vim-gcc-dev/ftdetect/gcc-dev.vim b/contrib/vim-gcc-dev/ftdetect/gcc-dev.vim
index ed6989aeacb..adc1bbade8f 100644
--- a/contrib/vim-gcc-dev/ftdetect/gcc-dev.vim
+++ b/contrib/vim-gcc-dev/ftdetect/gcc-dev.vim
@@ -1,6 +1,6 @@
 " Vim file type detection rules for GCC development
 "
-" Copyright (C) 2018 Free Software Foundation, Inc.
+" Copyright (C) 2018-2022 Free Software Foundation, Inc.
 "
 " This script is free software; you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
diff --git a/contrib/vim-gcc-dev/syntax/gcc-match.vim b/contrib/vim-gcc-dev/syntax/gcc-match.vim
index 356b07a15b2..ed3f92efd9c 100644
--- a/contrib/vim-gcc-dev/syntax/gcc-match.vim
+++ b/contrib/vim-gcc-dev/syntax/gcc-match.vim
@@ -1,6 +1,6 @@
 " Vim syntax highlighting rules for GCC match-and-simplify language.
 "
-" Copyright (C) 2018 Free Software Foundation, Inc.
+" Copyright (C) 2018-2022 Free Software Foundation, Inc.
 "
 " This script is free software; you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
diff --git a/contrib/vim-gcc-dev/syntax/gcc-rtl.vim b/contrib/vim-gcc-dev/syntax/gcc-rtl.vim
index 6b674e0285b..c774aded737 100644
--- a/contrib/vim-gcc-dev/syntax/gcc-rtl.vim
+++ b/contrib/vim-gcc-dev/syntax/gcc-rtl.vim
@@ -1,6 +1,6 @@
 " Syntax highlighting rules for RTL dump files (for Vim).
 "
-" Copyright (C) 2018 Free Software Foundation, Inc.
+" Copyright (C) 2018-2022 Free Software Foundation, Inc.
 "
 " This script is free software; you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
diff --git a/contrib/vim-gcc-dev/syntax/gimple.vim b/contrib/vim-gcc-dev/syntax/gimple.vim
index 6a0150d6f4e..949b83ec1c4 100644
--- a/contrib/vim-gcc-dev/syntax/gimple.vim
+++ b/contrib/vim-gcc-dev/syntax/gimple.vim
@@ -1,6 +1,6 @@
 " Syntax highlighting rules for GIMPLE dump files (for Vim).
 "
-" Copyright (C) 2015 Free Software Foundation, Inc.
+" Copyright (C) 2015-2022 Free Software Foundation, Inc.
 "
 " This script is free software; you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
diff --git a/contrib/vimrc b/contrib/vimrc
index b7a8ab7360c..f477d882aa3 100644
--- a/contrib/vimrc
+++ b/contrib/vimrc
@@ -11,7 +11,7 @@
 "   $ make vimrc
 " from GCC build folder.
 " 
-" Copyright (C) 2014 Free Software Foundation, Inc.
+" Copyright (C) 2014-2022 Free Software Foundation, Inc.
 "
 " This program is free software; you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
-- 
2.38.1

Re: [PATCH] contrib: add contrib to update-copyright.py script

[Jakub Jelinek]

On Wed, Dec 14, 2022 at 02:10:32PM +0100, Martin Liška wrote:
> +class ContribFilder(GenericFilter):

s/Filder/Filter/g ?

> +    def __init__ (self):
> +        GenericFilter.__init__ (self)
> +
> +        self.skip_files |= set ([
> +                # A different copyrights.
> +                'unicode-license.txt',
> +                'Info.plist',
> +                # Contains CR (^M).
> +                'repro_fail',
> +                ])
> +
>  class GCCCopyright (Copyright):
>      def __init__ (self, errors):
>          Copyright.__init__ (self, errors)
> @@ -699,6 +711,7 @@ class GCCCopyright (Copyright):
>          self.add_external_author ('Advanced Micro Devices Inc.')
>          self.add_external_author ('Ami Tavory and Vladimir Dreizin, IBM-HRL.')
>          self.add_external_author ('Cavium Networks.')
> +        self.add_external_author ('David Malcolm')
>          self.add_external_author ('Faraday Technology Corp.')
>          self.add_external_author ('Florida State University')
>          self.add_external_author ('Gerard Jungman')
> @@ -738,7 +751,7 @@ class GCCCmdLine (CmdLine):
>          # boehm-gc is imported from upstream.
>          self.add_dir ('c++tools')
>          self.add_dir ('config', ConfigFilter())
> -        # contrib isn't really part of GCC.
> +        self.add_dir ('contrib', ContribFilder())
>          self.add_dir ('fixincludes')
>          self.add_dir ('gcc', GCCFilter())
>          self.add_dir (os.path.join ('gcc', 'testsuite'), TestsuiteFilter())

	Jakub

Re: [PATCH] contrib: add contrib to update-copyright.py script

[Martin Liška]

On 12/14/22 14:13, Jakub Jelinek wrote:
> s/Filder/Filter/g ?

Yep. Pushed with the fix as there hasn't been any comments on this.

Martin