config-list.mk: Remove rs6000-ibm-aix4.3, rs6000-ibm-aix5.1, rs6000-ibm-aix5.2.

[gcc.git] / contrib / update-copyright.py

diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
old mode 100644 (file)
new mode 100755 (executable)
index 42d0bfb..ebefa46
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013-2016 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
@@ -183,6 +183,7 @@ class Copyright:
             '|[Cc]opyright\s+%s'
             '|[Cc]opyright\s+©'
             '|[Cc]opyright\s+@copyright{}'
+            '|copyright = u\''
             '|@set\s+copyright[\w-]+)'
 
             # 2: the years.  Include the whitespace in the year, so that
@@ -363,7 +364,8 @@ class Copyright:
             return (False, orig_line, next_line)
 
         line = (line[:match.start (2)]
-                + ' ' + canon_form + self.separator
+                + ('' if intro.startswith ('copyright = ') else ' ')
+                + canon_form + self.separator
                 + line[match.end (2):])
 
         # Use the standard (C) form.
@@ -629,15 +631,6 @@ class LibJavaFilter (GenericFilter):
             return re.compile ('.*icSigCopyrightTag')
         return GenericFilter.get_line_filter (self, dir, filename)
 
-class LibMudflapFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_dirs |= set ([
-                # Handled separately.
-                'testsuite',
-                ])
-
 class LibStdCxxFilter (GenericFilter):
     def __init__ (self):
         GenericFilter.__init__ (self)
@@ -694,6 +687,7 @@ class GCCCopyright (Copyright):
         self.add_external_author ('James Theiler, Brian Gough')
         self.add_external_author ('Makoto Matsumoto and Takuji Nishimura,')
         self.add_external_author ('National Research Council of Canada.')
+        self.add_external_author ('NVIDIA Corporation')
         self.add_external_author ('Peter Dimov and Multi Media Ltd.')
         self.add_external_author ('Peter Dimov')
         self.add_external_author ('Pipeline Associates, Inc.')
@@ -721,29 +715,34 @@ class GCCCmdLine (CmdLine):
         self.add_dir ('gcc', GCCFilter())
         self.add_dir (os.path.join ('gcc', 'testsuite'), TestsuiteFilter())
         self.add_dir ('gnattools')
+        self.add_dir ('gotools')
         self.add_dir ('include')
+        # intl is imported from upstream.
         self.add_dir ('libada')
         self.add_dir ('libatomic')
         self.add_dir ('libbacktrace')
+        self.add_dir ('libcc1')
+        # libcilkrts is imported from upstream.
         self.add_dir ('libcpp', LibCppFilter())
         self.add_dir ('libdecnumber')
         # libffi is imported from upstream.
         self.add_dir ('libgcc', LibGCCFilter())
         self.add_dir ('libgfortran')
+        # libgo is imported from upstream.
         self.add_dir ('libgomp')
         self.add_dir ('libiberty')
         self.add_dir ('libitm')
         self.add_dir ('libjava', LibJavaFilter())
         self.add_dir (os.path.join ('libjava', 'testsuite'), TestsuiteFilter())
-        self.add_dir ('libmudflap', LibMudflapFilter())
-        self.add_dir (os.path.join ('libmudflap', 'testsuite'),
-                      TestsuiteFilter())
         self.add_dir ('libobjc')
+        # liboffloadmic is imported from upstream.
         self.add_dir ('libquadmath')
-        # libsanitiser is imported from upstream.
+        # libsanitizer is imported from upstream.
         self.add_dir ('libssp')
         self.add_dir ('libstdc++-v3', LibStdCxxFilter())
+        self.add_dir ('libvtv')
         self.add_dir ('lto-plugin')
+        # maintainer-scripts maintainer-scripts
         # zlib is imported from upstream.
 
         self.default_dirs = [
@@ -757,7 +756,6 @@ class GCCCmdLine (CmdLine):
             'libgfortran',
             'libgomp',
             'libitm',
-            'libmudflap',
             'libobjc',
             'libstdc++-v3',
             ]