Merge commit '7f4ba5480e0ee5c03317d24d3fa858c0966f3464'

ChangeLog

@@ -1,3 +1,25 @@
+2024-04-04  Paul-Antoine Arras  <[email protected]>
+
+	* MAINTAINERS: Update my email address.
+
+2024-04-04  Kyrylo Tkachov  <[email protected]>
+
+	* MAINTAINERS: Update my email details, remove myself as arm
+	maintainer.  Add myself to DCO section.
+
+2024-04-02  Jakub Jelinek  <[email protected]>
+
+	PR bootstrap/106472
+	* Makefile.tpl (make-postboot-target-dep): New lambda.
+	Use it to add --enable-bootstrap dependencies of target modules
+	on other target modules if the latter aren't bootstrapped.
+	* Makefile.in: Regenerate.
+
+2024-04-02  Jakub Jelinek  <[email protected]>
+
+	* Makefile.tpl: Fix duplicated words; returns returns ->
+	returns.
+
 2024-03-08  Filip Kastl  <[email protected]>
 
 	* MAINTAINERS: Fix order of names in Write After Aproval

MAINTAINERS

@@ -52,7 +52,7 @@ docs, and the testsuite related to that.
 aarch64 port		Richard Earnshaw	<[email protected]>
 aarch64 port		Richard Sandiford	<[email protected]>
 aarch64 port		Marcus Shawcroft	<[email protected]>
-aarch64 port		Kyrylo Tkachov		<[email protected]>
+aarch64 port		Kyrylo Tkachov		<[email protected]>
 alpha port		Richard Henderson	<[email protected]>
 amdgcn port		Julian Brown		<[email protected]>
 amdgcn port		Andrew Stubbs		<[email protected]>
@@ -61,7 +61,6 @@ arc port		Claudiu Zissulescu	<[email protected]>
 arm port		Nick Clifton		<[email protected]>
 arm port		Richard Earnshaw	<[email protected]>
 arm port		Ramana Radhakrishnan	<[email protected]>
-arm port		Kyrylo Tkachov		<[email protected]>
 avr port		Denis Chertykov		<[email protected]>
 bfin port		Jie Zhang		<[email protected]>
 bpf port		Jose E. Marchesi	<[email protected]>
@@ -325,7 +324,7 @@ from other maintainers or reviewers.
 Mark G. Adams					<[email protected]>
 Ajit Kumar Agarwal				<[email protected]>
 Pedro Alves					<[email protected]>
-Paul-Antoine Arras				<pa@codesourcery.com>
+Paul-Antoine Arras				<parras@baylibre.com>
 Arsen Arsenović		      	    		<[email protected]>
 Raksit Ashok					<[email protected]>
 Matt Austern					<[email protected]>
@@ -782,6 +781,7 @@ Nathaniel Shead					<[email protected]>
 Nathan Sidwell					<[email protected]>
 Edward Smith-Rowland				<[email protected]>
 Fangrui Song	                                <[email protected]>
+Kyrylo Tkachov					<[email protected]>
 Petter Tomner					<[email protected]>
 Martin Uecker					<[email protected]>
 Jonathan Wakely					<[email protected]>

Makefile.in

@@ -68680,6 +68680,39 @@ configure-flex: stage_last
 configure-m4: stage_last
 @endif gcc-bootstrap
 
+@if gcc-bootstrap
+@unless target-zlib-bootstrap
+configure-target-fastjar: maybe-configure-target-zlib
+@endunless target-zlib-bootstrap
+@unless target-zlib-bootstrap
+all-target-fastjar: maybe-all-target-zlib
+@endunless target-zlib-bootstrap
+@unless target-libstdc++-v3-bootstrap
+configure-target-libgo: maybe-all-target-libstdc++-v3
+@endunless target-libstdc++-v3-bootstrap
+@unless target-libbacktrace-bootstrap
+all-target-libgo: maybe-all-target-libbacktrace
+@endunless target-libbacktrace-bootstrap
+@unless target-libatomic-bootstrap
+all-target-libgo: maybe-all-target-libatomic
+@endunless target-libatomic-bootstrap
+@unless target-libstdc++-v3-bootstrap
+configure-target-libgm2: maybe-all-target-libstdc++-v3
+@endunless target-libstdc++-v3-bootstrap
+@unless target-libatomic-bootstrap
+all-target-libgm2: maybe-all-target-libatomic
+@endunless target-libatomic-bootstrap
+@unless target-libstdc++-v3-bootstrap
+configure-target-libgrust: maybe-all-target-libstdc++-v3
+@endunless target-libstdc++-v3-bootstrap
+@unless target-libbacktrace-bootstrap
+configure-target-libgfortran: maybe-all-target-libbacktrace
+@endunless target-libbacktrace-bootstrap
+@unless target-libbacktrace-bootstrap
+configure-target-libgo: maybe-all-target-libbacktrace
+@endunless target-libbacktrace-bootstrap
+@endif gcc-bootstrap
+
 @unless gcc-bootstrap
 all-gnattools: maybe-all-target-libstdc++-v3
 configure-libcc1: maybe-configure-gcc

Makefile.tpl

@@ -1979,7 +1979,7 @@ configure-target-[+module+]: maybe-all-gcc[+
    (define dep-maybe (lambda ()
       (if (exist? "hard") "" "maybe-")))
 
-   ;; dep-kind returns returns "prebootstrap" for configure or build
+   ;; dep-kind returns "prebootstrap" for configure or build
    ;; dependencies of bootstrapped modules on a build module
    ;; (e.g. all-gcc on all-build-bison); "normal" if the dependency is
    ;; on an "install" target, or if the dependence module is not
@@ -2016,6 +2016,25 @@ configure-target-[+module+]: maybe-all-gcc[+
 	 (unless (=* target "target-")
            (string-append "configure-" target ": " dep "\n"))))))
 
+   ;; Dependencies in between target modules if the dependencies
+   ;; are bootstrap target modules and the target modules which
+   ;; depend on them are emitted inside of @unless gcc-bootstrap.
+   ;; Unfortunately, some target modules like libatomic or libbacktrace
+   ;; have bootstrap flag set, but whether they are actually built
+   ;; during bootstrap or after bootstrap depends on e.g. enabled languages;
+   ;; if d is enabled, libphobos is built as target module and depends
+   ;; on libatomic and libbacktrace, which are therefore also built as
+   ;; bootstrap modules.  If d is not enabled but go is, libatomic and
+   ;; libbacktrace are just dependencies of libgo which is not a bootstrap
+   ;; target module, but we need dependencies on libatomic and libbacktrace
+   ;; in that case even when gcc-bootstrap.  This lambda emits those.
+   (define make-postboot-target-dep (lambda ()
+     (let ((target (dep-module "module")) (on (dep-module "on")))
+       (when (=* on "target-")
+	 (when (=* target "target-")
+	   (string-append "@unless " on "-bootstrap\n" (make-dep "" "")
+			  "\n@endunless " on "-bootstrap\n"))))))
+
    ;; We now build the hash table that is used by dep-kind.
    (define boot-modules (make-hash-table 113))
    (define postboot-targets (make-hash-table 113))
@@ -2048,6 +2067,11 @@ configure-target-[+module+]: maybe-all-gcc[+
 [+ == "postbootstrap" +][+ (make-postboot-dep) +][+ ESAC +][+
 ENDFOR dependencies +]@endif gcc-bootstrap
 
+@if gcc-bootstrap
+[+ FOR dependencies +][+ CASE (dep-kind) +]
+[+ == "postbootstrap" +][+ (make-postboot-target-dep) +][+ ESAC +][+
+ENDFOR dependencies +]@endif gcc-bootstrap
+
 @unless gcc-bootstrap
 [+ FOR dependencies +][+ CASE (dep-kind) +]
 [+ == "postbootstrap" +][+ (make-dep "" "") +]

config/ChangeLog

@@ -1,3 +1,8 @@
+2024-04-02  Jakub Jelinek  <[email protected]>
+
+	* lcmessage.m4: Fix duplicated words; can can -> can,
+	package package -> package.
+
 2024-01-11  Mike Frysinger  <[email protected]>
 
 	* acinclude.m4 (CYG_AC_PATH_LIBERTY): Delete.

config/lcmessage.m4

@@ -6,13 +6,13 @@ dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:

contrib/ChangeLog

@@ -1,3 +1,27 @@
+2024-04-12  Filip Kastl  <[email protected]>
+
+	* check-params-in-docs.py: Ignore target specific params.
+
+2024-04-11  Martin Jambor  <[email protected]>
+
+	* check-params-in-docs.py (ignored): Add
+	gcn-preferred-vectorization-factor.
+
+2024-04-08  Jakub Jelinek  <[email protected]>
+
+	* gcc-changelog/git_update_version.py: Add
+	8057f9aa1f7e70490064de796d7a8d42d446caf8 to IGNORED_COMMITS.
+
+2024-03-19  Jonathan Wakely  <[email protected]>
+
+	* unicode/gen_libstdcxx_unicode_data.py: Fix header of generated
+	file to name the correct script.
+
+2024-03-18  Jonathan Wakely  <[email protected]>
+
+	* gcc_update: Add more generated files in libcc1, lto-plugin,
+	fixincludes, and libstdc++-v3.
+
 2024-03-08  Sam James  <[email protected]>
 
 	PR other/109668

contrib/check-params-in-docs.py

@@ -38,6 +38,9 @@ def get_param_tuple(line):
     description = line[i:].strip()
     return (name, description)
 
+def target_specific(param):
+    return param.split('-')[0] in ('aarch64', 'gcn', 'x86')
+
 
 parser = argparse.ArgumentParser()
 parser.add_argument('texi_file')
@@ -46,12 +49,15 @@ def get_param_tuple(line):
 args = parser.parse_args()
 
 ignored = {'logical-op-non-short-circuit'}
-params = {}
+help_params = {}
 
 for line in open(args.params_output).readlines():
     if line.startswith(' ' * 2) and not line.startswith(' ' * 8):
         r = get_param_tuple(line)
-        params[r[0]] = r[1]
+        help_params[r[0]] = r[1]
+
+# Skip target-specific params
+help_params = [x for x in help_params.keys() if not target_specific(x)]
 
 # Find section in .texi manual with parameters
 texi = ([x.strip() for x in open(args.texi_file).readlines()])
@@ -66,14 +72,13 @@ def get_param_tuple(line):
             texi_params.append(line[len(token):])
             break
 
-# skip digits
+# Skip digits
 texi_params = [x for x in texi_params if not x[0].isdigit()]
-# skip aarch64 params
-texi_params = [x for x in texi_params if not x.startswith('aarch64')]
-sorted_params = sorted(texi_params)
+# Skip target-specific params
+texi_params = [x for x in texi_params if not target_specific(x)]
 
 texi_set = set(texi_params) - ignored
-params_set = set(params.keys()) - ignored
+params_set = set(help_params) - ignored
 
 success = True
 extra = texi_set - params_set

contrib/gcc-changelog/git_update_version.py

@@ -38,7 +38,8 @@
         '86d8e0c0652ef5236a460b75c25e4f7093cc0651',
         'e4cba49413ca429dc82f6aa2e88129ecb3fdd943',
         '1957bedf29a1b2cc231972aba680fe80199d5498',
-        '040e5b0edbca861196d9e2ea2af5e805769c8d5d')
+        '040e5b0edbca861196d9e2ea2af5e805769c8d5d',
+        '8057f9aa1f7e70490064de796d7a8d42d446caf8')
 
 FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s'
 logging.basicConfig(level=logging.INFO, format=FORMAT,

contrib/gcc_update

@@ -70,6 +70,7 @@ files_and_dependencies () {
 # fixincludes
 fixincludes/configure: fixincludes/configure.ac fixincludes/aclocal.m4
 fixincludes/config.h.in: fixincludes/configure.ac fixincludes/aclocal.m4
+fixincludes/fixincl.x: fixincludes/inclhack.def fixincludes/fixincl.tpl
 # intl library
 intl/plural.c: intl/plural.y
 intl/plural-config.h: intl/plural.y
@@ -106,6 +107,7 @@ gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h
 # direct2s.c:35: warning: current file is older than direct2.c
 gcc/testsuite/gcc.dg/cpp/direct2s.c: gcc/testsuite/gcc.dg/cpp/direct2.c
 # lto-plugin
+lto-plugin/aclocal.m4: lto-plugin/configure.ac
 lto-plugin/configure: lto-plugin/configure.ac lto-plugin/aclocal.m4
 lto-plugin/Makefile.in: lto-plugin/Makefile.am lto-plugin/aclocal.m4
 # tools
@@ -187,7 +189,13 @@ libphobos/config.h.in: libphobos/configure.ac libphobos/aclocal.m4
 libphobos/configure: libphobos/configure.ac libphobos/aclocal.m4
 libphobos/src/Makefile.in: libphobos/src/Makefile.am libphobos/aclocal.m4
 libphobos/testsuite/Makefile.in: libphobos/testsuite/Makefile.am libphobos/aclocal.m4
+libstdc++-v3/aclocal.m4: libstdc++-v3/configure.ac libstdc++-v3/acinclude.m4
+libstdc++-v3/Makefile.in: libstdc++-v3/Makefile.am libstdc++-v3/aclocal.m4
+libstdc++-v3/configure: libstdc++-v3/configure.ac libstdc++-v3/acinclude.m4
 libstdc++-v3/include/bits/version.h: libstdc++-v3/include/bits/version.def libstdc++-v3/include/bits/version.tpl
+libcc1/aclocal.m4: libcc1/configure.ac
+libcc1/Makefile.in: libcc1/Makefile.am libcc1/configure.ac libcc1/aclocal.m4
+libcc1/configure: libcc1/configure.ac
 # Top level
 Makefile.in: Makefile.tpl Makefile.def
 configure: configure.ac config/acx.m4

contrib/unicode/gen_libstdcxx_unicode_data.py

@@ -29,9 +29,11 @@
 import sys
 import re
 import math
+import os
 
-print("""// Generated by contrib/unicode/gen_std_format_width.py, do not edit.
-
+self = os.path.basename(__file__)
+print("// Generated by contrib/unicode/{}, do not edit.".format(self))
+print("""
 // Copyright The GNU Toolchain Authors.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free