Attempt merge queue of dkm/bump-2025-06-26

ChangeLog

@@ -1,3 +1,36 @@
+2025-07-07  Tamar Christina  <[email protected]>
+
+	* MAINTAINERS: Add myself to AArch64 pot.
+
+2025-07-04  Andrew Pinski  <[email protected]>
+
+	* MAINTAINERS: Replace tabs with spaces.
+
+2025-07-04  Alex Coplan  <[email protected]>
+
+	* MAINTAINERS (Reviewers): Add myself for the aarch64 port.
+
+2025-07-03  Andrew Pinski  <[email protected]>
+
+	* MAINTAINERS: Add myself as an aarch64 port reviewer.
+
+2025-06-22  Nicolas Boulenguez  <[email protected]>
+
+	PR ada/120106
+	* Makefile.tpl: Add GNATMAKE_FOR_BUILD to {HOST,BASE_TARGET}_EXPORTS
+	* Makefile.in: Regenerate.
+	* configure.ac: Set the default and substitute the variable.
+	* configure: Regenerate.
+
+2025-06-09  Kugan Vivekanandarajah  <[email protected]>
+
+	* configure.ac: Special case cpu_type for x86_64.
+	* configure: Regenerate.
+
+2025-06-09  Peter Bergner  <[email protected]>
+
+	* MAINTAINERS: Update my email address and add myself to DCO.
+
 2025-05-28  Kugan Vivekanandarajah  <[email protected]>
 
 	* Makefile.def: Fix typo in cpu_type

MAINTAINERS

@@ -57,6 +57,7 @@ docs, and the testsuite related to that.
 aarch64 ldp/stp         Alex Coplan             <[email protected]>
 aarch64 port            Richard Earnshaw        <[email protected]>
 aarch64 port            Richard Sandiford       <[email protected]>
+aarch64 port            Tamar Christina         <[email protected]>
 aarch64 port            Kyrylo Tkachov          <[email protected]>
 alpha port              Richard Henderson       <[email protected]>
 amdgcn port             Julian Brown            <[email protected]>
@@ -274,6 +275,8 @@ check in changes outside of the parts of the compiler they maintain.
 
                         Reviewers
 
+aarch64 port            Alex Coplan             <[email protected]>
+aarch64 port            Andrew Pinski           <[email protected]>
 arm port (MVE)          Christophe Lyon         <[email protected]>
 callgraph               Martin Jambor           <[email protected]>
 C front end             Marek Polacek           <[email protected]>
@@ -308,7 +311,7 @@ loop optimizer          Zdenek Dvorak           <[email protected]>
 LTO                     Richard Biener          <[email protected]>
 LTO plugin              Cary Coutant            <[email protected]>
 Plugin                  Le-Chun Wu              <[email protected]>
-register allocation     Peter Bergner           <bergner@linux.ibm.com>
+register allocation     Peter Bergner           <bergner@tenstorrent.com>
 register allocation     Kenneth Zadeck          <[email protected]>
 register allocation     Seongbae Park           <[email protected]>
 riscv port              Robin Dapp              <[email protected]>
@@ -358,7 +361,7 @@ Serge Belyshev                  -               <[email protected]>
 Jon Beniston                    jbeniston       <[email protected]>
 Andrew Bennett                  -               <[email protected]>
 Andrew Benson                   abensonca       <[email protected]>
-Peter Bergner                   bergner         <bergner@linux.ibm.com>
+Peter Bergner                   bergner         <bergner@tenstorrent.com>
 Daniel Berlin                   dberlin         <[email protected]>
 Pat Bernardi                    -               <[email protected]>
 Jan Beulich                     -               <[email protected]>
@@ -934,6 +937,7 @@ information.
 
 
 Soumya AR                                       <[email protected]>
+Peter Bergner                                   <[email protected]>
 Dhruv Chawla                                    <[email protected]>
 Juergen Christ                                  <[email protected]>
 Giuseppe D'Angelo                               <[email protected]>

Makefile.in

@@ -207,6 +207,7 @@ HOST_EXPORTS = \
 	GOC="$(GOC)"; export GOC; \
 	GDC="$(GDC)"; export GDC; \
 	GM2="$(GM2)"; export GM2; \
+	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -312,6 +313,7 @@ BASE_TARGET_EXPORTS = \
 	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
 	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
 	GM2="$(GM2_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GM2; \
+	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	DSYMUTIL="$(DSYMUTIL_FOR_TARGET)"; export DSYMUTIL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
@@ -381,6 +383,7 @@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
 GOC_FOR_BUILD = @GOC_FOR_BUILD@
 GDC_FOR_BUILD = @GDC_FOR_BUILD@
 GM2_FOR_BUILD = @GM2_FOR_BUILD@
+GNATMAKE_FOR_BUILD = @GNATMAKE_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LD_FOR_BUILD = @LD_FOR_BUILD@
 NM_FOR_BUILD = @NM_FOR_BUILD@

Makefile.tpl

@@ -210,6 +210,7 @@ HOST_EXPORTS = \
 	GOC="$(GOC)"; export GOC; \
 	GDC="$(GDC)"; export GDC; \
 	GM2="$(GM2)"; export GM2; \
+	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -315,6 +316,7 @@ BASE_TARGET_EXPORTS = \
 	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
 	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
 	GM2="$(GM2_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GM2; \
+	GNATMAKE_FOR_BUILD="$(GNATMAKE_FOR_BUILD)"; export GNATMAKE_FOR_BUILD; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	DSYMUTIL="$(DSYMUTIL_FOR_TARGET)"; export DSYMUTIL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
@@ -384,6 +386,7 @@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
 GOC_FOR_BUILD = @GOC_FOR_BUILD@
 GDC_FOR_BUILD = @GDC_FOR_BUILD@
 GM2_FOR_BUILD = @GM2_FOR_BUILD@
+GNATMAKE_FOR_BUILD = @GNATMAKE_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LD_FOR_BUILD = @LD_FOR_BUILD@
 NM_FOR_BUILD = @NM_FOR_BUILD@

configure

@@ -653,6 +653,7 @@ RANLIB_FOR_BUILD
 NM_FOR_BUILD
 LD_FOR_BUILD
 LDFLAGS_FOR_BUILD
+GNATMAKE_FOR_BUILD
 GDC_FOR_BUILD
 GOC_FOR_BUILD
 GFORTRAN_FOR_BUILD
@@ -3397,6 +3398,10 @@ case "${target}" in
 esac
 
 cpu_type=`echo ${host} | sed 's/-.*$//'`
+# Special case cpu_type for x86_64 as it shares AUTO_PROFILE from i386.
+if test "${cpu_type}" = "x86_64" ; then
+  cpu_type="i386"
+fi
 
 
 # Disable libssp for some systems.
@@ -4249,11 +4254,12 @@ if test "${build}" != "${host}" ; then
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
+  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
   DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
   GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
   GDC_FOR_BUILD=${GDC_FOR_BUILD-gdc}
-  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
+  GNATMAKE_FOR_BUILD=${GNATMAKE_FOR_BUILD-gnatmake}
   LD_FOR_BUILD=${LD_FOR_BUILD-ld}
   NM_FOR_BUILD=${NM_FOR_BUILD-nm}
   RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
@@ -4264,11 +4270,12 @@ else
   AS_FOR_BUILD="\$(AS)"
   CC_FOR_BUILD="\$(CC)"
   CXX_FOR_BUILD="\$(CXX)"
+  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
   DSYMUTIL_FOR_BUILD="\$(DSYMUTIL)"
   GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
   GOC_FOR_BUILD="\$(GOC)"
   GDC_FOR_BUILD="\$(GDC)"
-  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
+  GNATMAKE_FOR_BUILD="\$(GNATMAKE)"
   LD_FOR_BUILD="\$(LD)"
   NM_FOR_BUILD="\$(NM)"
   RANLIB_FOR_BUILD="\$(RANLIB)"
@@ -11691,6 +11698,7 @@ done
 
 
 
+
 
 # Generate default definitions for YACC, M4, LEX and other programs that run
 # on the build machine.  These are used if the Makefile can't locate these

configure.ac

@@ -622,6 +622,10 @@ case "${target}" in
 esac
 
 cpu_type=`echo ${host} | sed 's/-.*$//'`
+# Special case cpu_type for x86_64 as it shares AUTO_PROFILE from i386.
+if test "${cpu_type}" = "x86_64" ; then
+  cpu_type="i386"
+fi
 AC_SUBST(cpu_type)
 
 # Disable libssp for some systems.
@@ -1446,11 +1450,12 @@ if test "${build}" != "${host}" ; then
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
+  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
   DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
   GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
   GDC_FOR_BUILD=${GDC_FOR_BUILD-gdc}
-  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
+  GNATMAKE_FOR_BUILD=${GNATMAKE_FOR_BUILD-gnatmake}
   LD_FOR_BUILD=${LD_FOR_BUILD-ld}
   NM_FOR_BUILD=${NM_FOR_BUILD-nm}
   RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
@@ -1461,11 +1466,12 @@ else
   AS_FOR_BUILD="\$(AS)"
   CC_FOR_BUILD="\$(CC)"
   CXX_FOR_BUILD="\$(CXX)"
+  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
   DSYMUTIL_FOR_BUILD="\$(DSYMUTIL)"
   GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
   GOC_FOR_BUILD="\$(GOC)"
   GDC_FOR_BUILD="\$(GDC)"
-  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
+  GNATMAKE_FOR_BUILD="\$(GNATMAKE)"
   LD_FOR_BUILD="\$(LD)"
   NM_FOR_BUILD="\$(NM)"
   RANLIB_FOR_BUILD="\$(RANLIB)"
@@ -3911,6 +3917,7 @@ AC_SUBST(DSYMUTIL_FOR_BUILD)
 AC_SUBST(GFORTRAN_FOR_BUILD)
 AC_SUBST(GOC_FOR_BUILD)
 AC_SUBST(GDC_FOR_BUILD)
+AC_SUBST(GNATMAKE_FOR_BUILD)
 AC_SUBST(LDFLAGS_FOR_BUILD)
 AC_SUBST(LD_FOR_BUILD)
 AC_SUBST(NM_FOR_BUILD)

contrib/ChangeLog

@@ -1,3 +1,50 @@
+2025-07-11  Richard Biener  <[email protected]>
+
+	* gcc-changelog/git_update_version.py: Stop updating gcc-12
+	branch.
+
+2025-07-08  Pierre-Emmanuel Patry  <[email protected]>
+
+	* prepare-commit-msg: Force default git prefixes.
+
+2025-07-07  Martin Jambor  <[email protected]>
+
+	* filter-clang-warnings.py (skip_warning): Also ignore
+	-Woverloaded-shift-op-parentheses, -Wunused-function,
+	-Wunneeded-internal-declaration, -Wvla-cxx-extension', and
+	-Wunused-command-line-argument everywhere and a warning about
+	m_logical_loc_mgr in diagnostic-path-output.cc.  Adjust gimple-match
+	and generic-match "filenames."  Ignore -Wnontrivial-memcall warnings
+	in wide-int.h, all warnings about unused stuff in files under
+	m2/gm2-compiler-boot, all -Wunused-private-field in rust FE, in
+	analyzer/ana-state-to-diagnostic-state.h and c-family/c-format.cc, all
+	Warnings in avr-mmcu.texi, install.texi and libgccjit.texi and all
+	-Wc23-extensions warnings in libiberty/sha1.c. Ignore
+	-Wunused-parameter in analyzer/sm.cc.  Reorder entries.
+
+2025-06-29  Filip Kastl  <[email protected]>
+
+	* mklog.py: In 'main()', specify variable 'root' as global.
+
+2025-06-26  Alex Coplan  <[email protected]>
+
+	* mklog.py (main): New.
+
+2025-06-23  David Malcolm  <[email protected]>
+
+	PR other/116792
+	PR testsuite/116163
+	PR sarif-replay/120792
+	* dg-lint/dg-lint: Add -fdiagnostics-add-output.
+	* dg-lint/libgdiagnostics.py: Add
+	diagnostic_manager_add_sink_from_spec.
+	(Manager.add_sink_from_spec): New.
+
+2025-06-23  Andrew Burgess  <[email protected]>
+
+	* dg-extract-results.py: Handle GDB's unexpected core file count.
+	* dg-extract-results.sh: Likewise.
+
 2025-05-27  Jan Hubicka  <[email protected]>
 
 	* gen_autofdo_event.py: Add support for AMD Zen 3 and

contrib/dg-extract-results.py

@@ -146,7 +146,8 @@ def __init__ (self):
             '# of unresolved testcases\t',
             '# of unsupported tests\t\t',
             '# of paths in test names\t',
-            '# of duplicate test names\t'
+            '# of duplicate test names\t',
+            '# of unexpected core files\t'
         ]
         self.runs = dict()
 

contrib/dg-extract-results.sh

@@ -403,7 +403,7 @@ BEGIN {
   variant="$VAR"
   tool="$TOOL"
   passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; kpasscnt=0; kfailcnt=0; unsupcnt=0; unrescnt=0; dgerrorcnt=0;
-  pathcnt=0; dupcnt=0
+  pathcnt=0; dupcnt=0; corecnt=0
   curvar=""; insummary=0
 }
 /^Running target /		{ curvar = \$3; next }
@@ -420,6 +420,7 @@ BEGIN {
 /^# of unsupported tests/	{ if (insummary == 1) unsupcnt += \$5; next; }
 /^# of paths in test names/	{ if (insummary == 1) pathcnt += \$7; next; }
 /^# of duplicate test names/	{ if (insummary == 1) dupcnt += \$6; next; }
+/^# of unexpected core files/	{ if (insummary == 1) corecnt += \$6; next; }
 /^$/				{ if (insummary == 1)
 				    { insummary = 0; curvar = "" }
 				  next
@@ -439,6 +440,7 @@ END {
   if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt)
   if (pathcnt != 0) printf ("# of paths in test names\t%d\n", pathcnt)
   if (dupcnt != 0) printf ("# of duplicate test names\t%d\n", dupcnt)
+  if (corecnt != 0) printf ("# of unexpected core files\t%d\n", corecnt)
 }
 EOF
 
@@ -460,7 +462,7 @@ cat << EOF > $TOTAL_AWK
 BEGIN {
   tool="$TOOL"
   passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; kfailcnt=0; unsupcnt=0; unrescnt=0; dgerrorcnt=0
-  pathcnt=0; dupcnt=0
+  pathcnt=0; dupcnt=0; corecnt=0
 }
 /^# of DejaGnu errors/		{ dgerrorcnt += \$5 }
 /^# of expected passes/		{ passcnt += \$5 }
@@ -474,6 +476,7 @@ BEGIN {
 /^# of unsupported tests/	{ unsupcnt += \$5 }
 /^# of paths in test names/	{ pathcnt += \$7 }
 /^# of duplicate test names/	{ dupcnt += \$6 }
+/^# of unexpected core files/	{ corecnt += \$6 }
 END {
   printf ("\n\t\t=== %s Summary ===\n\n", tool)
   if (dgerrorcnt != 0) printf ("# of DejaGnu errors\t\t%d\n", dgerrorcnt)
@@ -488,6 +491,7 @@ END {
   if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt)
   if (pathcnt != 0) printf ("# of paths in test names\t%d\n", pathcnt)
   if (dupcnt != 0) printf ("# of duplicate test names\t%d\n", dupcnt)
+  if (corecnt != 0) printf ("# of unexpected core files\t%d\n", corecnt)
 }
 EOF
 

contrib/dg-lint/dg-lint

@@ -380,9 +380,17 @@ def skip_file(filename):
 def main(argv):
     parser = argparse.ArgumentParser()#usage=__doc__)
     parser.add_argument('paths', nargs='+', type=pathlib.Path)
+    parser.add_argument('-fdiagnostics-add-output', action='append')
     opts = parser.parse_args(argv[1:])
 
     ctxt = Context()
+    control_mgr = libgdiagnostics.Manager()
+    control_mgr.add_text_sink()
+    for scheme in opts.fdiagnostics_add_output:
+        ctxt.mgr.add_sink_from_spec("-fdiagnostics-add-output=",
+                                    scheme,
+                                    control_mgr)
+
     for path in opts.paths:
         if path.is_dir():
             for dirpath, dirnames, filenames in os.walk(path):

contrib/dg-lint/libgdiagnostics.py

@@ -124,6 +124,13 @@ class c_diagnostic_physical_location(ctypes.Structure):
        ctypes.c_char_p]
 cdll.diagnostic_add_fix_it_hint_replace.restype = None
 
+cdll.diagnostic_manager_add_sink_from_spec.argtypes \
+    = [c_diagnostic_manager_ptr,
+       ctypes.c_char_p,
+       ctypes.c_char_p,
+       c_diagnostic_manager_ptr]
+cdll.diagnostic_manager_add_sink_from_spec.restype = ctypes.c_int
+
 # Helper functions
 
 def _to_utf8(s: str):
@@ -156,6 +163,16 @@ def add_text_sink(self):
                                                c_stderr,
                                                DIAGNOSTIC_COLORIZE_IF_TTY)
 
+    def add_sink_from_spec(self, option_name: str, scheme: str, control_mgr):
+        assert self.c_mgr
+        assert control_mgr.c_mgr
+        res = cdll.diagnostic_manager_add_sink_from_spec (self.c_mgr,
+                                                          _to_utf8(option_name),
+                                                          _to_utf8(scheme),
+                                                          control_mgr.c_mgr)
+        if res:
+            raise RuntimeError()
+
     def get_file(self, path: str, sarif_lang: str = None):
         assert self.c_mgr
         assert path