.gcc.metadata

@@ -1,4 +1,3 @@
-fdeaf702eb50579d38faf7dc2aadbf5e27a2c432 SOURCES/gcc-11.5.0-20240719.tar.xz
+b7245af5eab1d4055b6590b6e4f5fb3b7f6c24bf SOURCES/gcc-8.5.0-20210514.tar.xz
-bbffc5a2b05e4f0c97e882f96c448504491dc4ed SOURCES/isl-0.18.tar.bz2
+3bdb3cc01fa7690a0e20ea5cfffcbe690f7665eb SOURCES/nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz
-6ec33952e824e837fef0e829c93d39d6a507082f SOURCES/newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz
+ce8eb83be0ac37fb5d5388df455a980fe37b4f13 SOURCES/nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz
-0e0c6f8d68ab0878f02287ac082c1077c831cd81 SOURCES/nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz

.gitignore

@@ -1,4 +1,3 @@
-SOURCES/gcc-11.5.0-20240719.tar.xz
+SOURCES/gcc-8.5.0-20210514.tar.xz
-SOURCES/isl-0.18.tar.bz2
+SOURCES/nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz
-SOURCES/newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz
+SOURCES/nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz
-SOURCES/nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz

SOURCES/gcc11-Wmismatched-dealloc-doc.patch

@@ -1,79 +0,0 @@
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 3419483c532..a2a6b1c98be 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -255,7 +255,7 @@ in the following sections.
- -Wno-inherited-variadic-ctor  -Wno-init-list-lifetime @gol
- -Winvalid-imported-macros @gol
- -Wno-invalid-offsetof  -Wno-literal-suffix @gol
---Wno-mismatched-new-delete -Wmismatched-tags @gol
-+-Wmismatched-new-delete -Wmismatched-tags @gol
- -Wmultiple-inheritance  -Wnamespaces  -Wnarrowing @gol
- -Wnoexcept  -Wnoexcept-type  -Wnon-virtual-dtor @gol
- -Wpessimizing-move  -Wno-placement-new  -Wplacement-new=@var{n} @gol
-@@ -3966,7 +3966,7 @@ The warning is inactive inside a system header file, such as the STL, so
- one can still use the STL.  One may also instantiate or specialize
- templates.
- 
--@item -Wno-mismatched-new-delete @r{(C++ and Objective-C++ only)}
-+@item -Wmismatched-new-delete @r{(C++ and Objective-C++ only)}
- @opindex Wmismatched-new-delete
- @opindex Wno-mismatched-new-delete
- Warn for mismatches between calls to @code{operator new} or @code{operator
-@@ -3998,7 +3998,7 @@ The related option @option{-Wmismatched-dealloc} diagnoses mismatches
- involving allocation and deallocation functions other than @code{operator
- new} and @code{operator delete}.
- 
--@option{-Wmismatched-new-delete} is enabled by default.
-+@option{-Wmismatched-new-delete} is included in @option{-Wall}.
- 
- @item -Wmismatched-tags @r{(C++ and Objective-C++ only)}
- @opindex Wmismatched-tags
-@@ -5543,6 +5543,8 @@ Options} and @ref{Objective-C and Objective-C++ Dialect Options}.
- -Wmemset-elt-size @gol
- -Wmemset-transposed-args @gol
- -Wmisleading-indentation @r{(only for C/C++)} @gol
-+-Wmismatched-dealloc @gol
-+-Wmismatched-new-delete @r{(only for C/C++)} @gol
- -Wmissing-attributes @gol
- -Wmissing-braces @r{(only for C/ObjC)} @gol
- -Wmultistatement-macros  @gol
-@@ -6428,7 +6430,7 @@ Ignoring the warning can result in poorly optimized code.
- disable the warning, but this is not recommended and should be done only
- when non-existent profile data is justified.
- 
--@item -Wno-mismatched-dealloc
-+@item -Wmismatched-dealloc
- @opindex Wmismatched-dealloc
- @opindex Wno-mismatched-dealloc
- 
-@@ -6461,7 +6463,7 @@ void f (void)
- In C++, the related option @option{-Wmismatched-new-delete} diagnoses
- mismatches involving either @code{operator new} or @code{operator delete}.
- 
--Option @option{-Wmismatched-dealloc} is enabled by default.
-+Option @option{-Wmismatched-dealloc} is included in @option{-Wall}.
- 
- @item -Wmultistatement-macros
- @opindex Wmultistatement-macros
-@@ -7951,9 +7953,9 @@ Warnings controlled by the option can be disabled either by specifying
- Disable @option{-Wframe-larger-than=} warnings.  The option is equivalent
- to @option{-Wframe-larger-than=}@samp{SIZE_MAX} or larger.
- 
--@item -Wno-free-nonheap-object
--@opindex Wno-free-nonheap-object
-+@item -Wfree-nonheap-object
- @opindex Wfree-nonheap-object
-+@opindex Wno-free-nonheap-object
- Warn when attempting to deallocate an object that was either not allocated
- on the heap, or by using a pointer that was not returned from a prior call
- to the corresponding allocation function.  For example, because the call
-@@ -7970,7 +7972,7 @@ void f (char *p)
- @}
- @end smallexample
- 
--@option{-Wfree-nonheap-object} is enabled by default.
-+@option{-Wfree-nonheap-object} is included in @option{-Wall}.
- 
- @item -Wstack-usage=@var{byte-size}
- @opindex Wstack-usage

SOURCES/gcc11-bind-now.patch

@@ -1,297 +0,0 @@
-From 36362544fb039599c0eb58d839e90ffb5410ad27 Mon Sep 17 00:00:00 2001
-From: Marek Polacek <polacek@redhat.com>
-Date: Wed, 9 Feb 2022 15:18:43 -0500
-Subject: [PATCH] configure: Implement --enable-host-bind-now
-
-As promised in the --enable-host-pie patch, this patch adds another
-configure option, --enable-host-bind-now, which adds -z now when linking
-the compiler executables in order to extend hardening.  BIND_NOW with RELRO
-allows the GOT to be marked RO; this prevents GOT modification attacks.
-
-This option does not affect linking of target libraries; you can use
-LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now to enable RELRO/BIND_NOW.
-
-Bootstrapped/regtested on x86_64-pc-linux-gnu (with the option enabled vs
-not enabled).  I suppose this is GCC 13 material, but maybe I'll get some
-comments anyway.
-
-c++tools/ChangeLog:
-
-	* configure.ac (--enable-host-bind-now): New check.
-	* configure: Regenerate.
-
-gcc/ChangeLog:
-
-	* configure.ac (--enable-host-bind-now): New check.  Add
-	-Wl,-z,now to LD_PICFLAG if --enable-host-bind-now.
-	* configure: Regenerate.
-	* doc/install.texi: Document --enable-host-bind-now.
-
-lto-plugin/ChangeLog:
-
-	* configure.ac (--enable-host-bind-now): New check.  Link with
-	-z,now.
-	* configure: Regenerate.
----
- c++tools/configure      | 11 +++++++++++
- c++tools/configure.ac   |  7 +++++++
- gcc/configure           | 20 ++++++++++++++++++--
- gcc/configure.ac        | 13 ++++++++++++-
- gcc/doc/install.texi    |  6 ++++++
- lto-plugin/configure    | 20 ++++++++++++++++++--
- lto-plugin/configure.ac | 11 +++++++++++
- 7 files changed, 83 insertions(+), 5 deletions(-)
-
-diff --git a/c++tools/configure b/c++tools/configure
-index c1aceb8404a..25432b5040d 100755
---- a/c++tools/configure
-+++ b/c++tools/configure
-@@ -631,6 +631,7 @@ ac_ct_CC
- GREP
- CXXCPP
- LD_PICFLAG
-+enable_host_bind_now
- PICFLAG
- MAINTAINER
- CXX_AUX_TOOLS
-@@ -704,6 +705,7 @@ enable_c___tools
- enable_checking
- enable_default_pie
- enable_host_pie
-+enable_host_bind_now
- with_gcc_major_version_only
- '
-       ac_precious_vars='build_alias
-@@ -1336,6 +1338,7 @@ Optional Features:
-                           yes,no,all,none,release.
-   --enable-default-pie    enable Position Independent Executable as default
-   --enable-host-pie       build host code as PIE
-+  --enable-host-bind-now  link host code as BIND_NOW
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -3009,6 +3012,14 @@ fi
- 
- 
- 
-+# Enable --enable-host-bind-now
-+# Check whether --enable-host-bind-now was given.
-+if test "${enable_host_bind_now+set}" = set; then :
-+  enableval=$enable_host_bind_now; LD_PICFLAG="$LD_PICFLAG -Wl,-z,now"
-+fi
-+
-+
-+
- 
- # Check if O_CLOEXEC is defined by fcntl
- 
-diff --git a/c++tools/configure.ac b/c++tools/configure.ac
-index 1e42689f2eb..d3f23f66f00 100644
---- a/c++tools/configure.ac
-+++ b/c++tools/configure.ac
-@@ -110,6 +110,13 @@ AC_ARG_ENABLE(host-pie,
- 		[build host code as PIE])],
- [PICFLAG=-fPIE; LD_PICFLAG=-pie], [])
- AC_SUBST(PICFLAG)
-+
-+# Enable --enable-host-bind-now
-+AC_ARG_ENABLE(host-bind-now,
-+[AS_HELP_STRING([--enable-host-bind-now],
-+       [link host code as BIND_NOW])],
-+[LD_PICFLAG="$LD_PICFLAG -Wl,-z,now"], [])
-+AC_SUBST(enable_host_bind_now)
- AC_SUBST(LD_PICFLAG)
- 
- # Check if O_CLOEXEC is defined by fcntl
-diff --git a/gcc/configure b/gcc/configure
-index 2ded5d4c50b..5671dc7dcf4 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -635,6 +635,7 @@ CET_HOST_FLAGS
- LD_PICFLAG
- PICFLAG
- enable_default_pie
-+enable_host_bind_now
- enable_host_pie
- enable_host_shared
- enable_plugin
-@@ -1023,6 +1024,7 @@ enable_version_specific_runtime_libs
- enable_plugin
- enable_host_shared
- enable_host_pie
-+enable_host_bind_now
- enable_libquadmath_support
- with_linker_hash_style
- with_diagnostics_color
-@@ -1786,6 +1788,7 @@ Optional Features:
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --enable-host-pie       build host code as PIE
-+  --enable-host-bind-now  link host code as BIND_NOW
-   --disable-libquadmath-support
-                           disable libquadmath support for Fortran
-   --enable-default-pie    enable Position Independent Executable as default
-@@ -32109,6 +32112,14 @@ fi
- 
- 
- 
-+# Enable --enable-host-bind-now
-+# Check whether --enable-host-bind-now was given.
-+if test "${enable_host_bind_now+set}" = set; then :
-+  enableval=$enable_host_bind_now;
-+fi
-+
-+
-+
- # Check whether --enable-libquadmath-support was given.
- if test "${enable_libquadmath_support+set}" = set; then :
-   enableval=$enable_libquadmath_support; ENABLE_LIBQUADMATH_SUPPORT=$enableval
-@@ -32295,6 +32306,8 @@ else
-   PICFLAG=
- fi
- 
-+
-+
- if test x$enable_host_pie = xyes; then
-   LD_PICFLAG=-pie
- elif test x$gcc_cv_no_pie = xyes; then
-@@ -32303,6 +32316,9 @@ else
-   LD_PICFLAG=
- fi
- 
-+if test x$enable_host_bind_now = xyes; then
-+  LD_PICFLAG="$LD_PICFLAG -Wl,-z,now"
-+fi
- 
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index dca995aeec7..6017bcbc8c6 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7497,6 +7497,12 @@ AC_ARG_ENABLE(host-pie,
- 		[build host code as PIE])])
- AC_SUBST(enable_host_pie)
- 
-+# Enable --enable-host-bind-now
-+AC_ARG_ENABLE(host-bind-now,
-+[AS_HELP_STRING([--enable-host-bind-now],
-+		[link host code as BIND_NOW])])
-+AC_SUBST(enable_host_bind_now)
-+
- AC_ARG_ENABLE(libquadmath-support,
- [AS_HELP_STRING([--disable-libquadmath-support],
-   [disable libquadmath support for Fortran])],
-@@ -7638,6 +7644,8 @@ else
-   PICFLAG=
- fi
- 
-+AC_SUBST([PICFLAG])
-+
- if test x$enable_host_pie = xyes; then
-   LD_PICFLAG=-pie
- elif test x$gcc_cv_no_pie = xyes; then
-@@ -7646,7 +7654,10 @@ else
-   LD_PICFLAG=
- fi
- 
--AC_SUBST([PICFLAG])
-+if test x$enable_host_bind_now = xyes; then
-+  LD_PICFLAG="$LD_PICFLAG -Wl,-z,now"
-+fi
-+
- AC_SUBST([LD_PICFLAG])
- 
- # Enable Intel CET on Intel CET enabled host if jit is enabled.
-diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 9747f832a75..b59af198d3e 100644
---- a/gcc/doc/install.texi
-+++ b/gcc/doc/install.texi
-@@ -1041,6 +1041,12 @@ protection against Return Oriented Programming (ROP) attacks.
- in which case @option{-fPIC} is used when compiling, and @option{-pie} when
- linking.
- 
-+@item --enable-host-bind-now
-+Specify that the @emph{host} executables should be linked with the option
-+@option{-Wl,-z,now}, which means that the dynamic linker will resolve all
-+symbols when the executables are started, and that in turn allows RELRO to
-+mark the GOT read-only, resulting in better security.
-+
- @item @anchor{with-gnu-as}--with-gnu-as
- Specify that the compiler should assume that the
- assembler it finds is the GNU assembler.  However, this does not modify
-diff --git a/lto-plugin/configure b/lto-plugin/configure
-index baa84adbb6c..669ccaede52 100755
---- a/lto-plugin/configure
-+++ b/lto-plugin/configure
-@@ -656,6 +656,7 @@ accel_dir_suffix
- gcc_build_dir
- CET_HOST_FLAGS
- ac_lto_plugin_ldflags
-+enable_host_bind_now
- ac_lto_plugin_warn_cflags
- EGREP
- GREP
-@@ -771,6 +772,7 @@ enable_maintainer_mode
- with_libiberty
- enable_dependency_tracking
- enable_largefile
-+enable_host_bind_now
- enable_cet
- with_gcc_major_version_only
- enable_shared
-@@ -1418,6 +1420,7 @@ Optional Features:
-   --disable-dependency-tracking
-                           speeds up one-time build
-   --disable-largefile     omit support for large files
-+  --enable-host-bind-now  link host code as BIND_NOW
-   --enable-cet            enable Intel CET in host libraries [default=auto]
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-static[=PKGS]  build static libraries [default=yes]
-@@ -5662,6 +5665,19 @@ if test "x$have_static_libgcc" = xyes; then
-    ac_lto_plugin_ldflags="-Wc,-static-libgcc"
- fi
- 
-+# Enable --enable-host-bind-now
-+# Check whether --enable-host-bind-now was given.
-+if test "${enable_host_bind_now+set}" = set; then :
-+  enableval=$enable_host_bind_now;
-+fi
-+
-+
-+
-+if test x$enable_host_bind_now = xyes; then
-+  ac_lto_plugin_ldflags="$ac_lto_plugin_ldflags -Wl,-z,now"
-+fi
-+
-+
- 
-  # Check whether --enable-cet was given.
- if test "${enable_cet+set}" = set; then :
-diff --git a/lto-plugin/configure.ac b/lto-plugin/configure.ac
-index 7e6f729e9dc..5d5fea8fe70 100644
---- a/lto-plugin/configure.ac
-+++ b/lto-plugin/configure.ac
-@@ -25,6 +25,17 @@ LDFLAGS="$saved_LDFLAGS"
- if test "x$have_static_libgcc" = xyes; then
-    ac_lto_plugin_ldflags="-Wc,-static-libgcc"
- fi
-+
-+# Enable --enable-host-bind-now
-+AC_ARG_ENABLE(host-bind-now,
-+[AS_HELP_STRING([--enable-host-bind-now],
-+       [link host code as BIND_NOW])])
-+AC_SUBST(enable_host_bind_now)
-+
-+if test x$enable_host_bind_now = xyes; then
-+  ac_lto_plugin_ldflags="$ac_lto_plugin_ldflags -Wl,-z,now"
-+fi
-+
- AC_SUBST(ac_lto_plugin_ldflags)
- 
- GCC_CET_HOST_FLAGS(CET_HOST_FLAGS)
-
-base-commit: bf799d3409cb9a189114a6c9ff5b7cd123915764
--- 
-2.34.1
-

SOURCES/gcc11-d-shared-libphobos.patch

@@ -1,20 +0,0 @@
-2019-01-17  Jakub Jelinek  <jakub@redhat.com>
-
-	* d-spec.cc (lang_specific_driver): Make -shared-libphobos
-	the default rather than -static-libphobos.
-
---- gcc/d/d-spec.cc.jj	2019-01-01 12:37:49.502444257 +0100
-+++ gcc/d/d-spec.cc	2019-01-17 17:09:45.364949246 +0100
-@@ -408,9 +408,9 @@ lang_specific_driver (cl_decoded_option
-   /* Add `-lgphobos' if we haven't already done so.  */
-   if (phobos_library != PHOBOS_NOLINK)
-     {
--      /* Default to static linking.  */
--      if (phobos_library != PHOBOS_DYNAMIC)
--	phobos_library = PHOBOS_STATIC;
-+      /* Default to shared linking.  */
-+      if (phobos_library != PHOBOS_STATIC)
-+	phobos_library = PHOBOS_DYNAMIC;
- 
- #ifdef HAVE_LD_STATIC_DYNAMIC
-       if (phobos_library == PHOBOS_STATIC && !static_link)

SOURCES/gcc11-dejagnu-multiline.patch

@@ -1,32 +0,0 @@
-commit 14c7757e9b751781360737f53b71f851fc356d3d
-Author: Jeff Law <jeffreyalaw@gmail.com>
-Date:   Fri Oct 29 11:30:15 2021 -0400
-
-    Avoid overly-greedy match in dejagnu regexp.
-    
-    Occasionally I've been seeing failures with the multi-line diagnostics.  It's never been clear what's causing the spurious failures, though I have long suspected a greedy regexp match.
-    
-    It happened again yesterday with a local change that in no way should affect diagnostics, so I finally went searching and found that sure enough the multi-line diagnostics had a ".*" in their regexp.  According to the comments, the .* is primarily to catch any dg directives that may appear -- ie it should eat to EOL, but not multiple lines.  But a .* can indeed match a newline and cause it to eat multiple lines.
-    
-    The fix is simple.  [^\r\n]* will eat to EOL, but not further.
-    
-    Regression tested on x86_64 and on our internal target.
-    
-    gcc/testsuite
-    
-            * lib/multiline.exp (_build_multiline_regex): Use a better
-            regexp than .* to match up to EOL.
-
-diff --git a/gcc/testsuite/lib/multiline.exp b/gcc/testsuite/lib/multiline.exp
-index 0e151b6d222..86387f8209b 100644
---- a/gcc/testsuite/lib/multiline.exp
-+++ b/gcc/testsuite/lib/multiline.exp
-@@ -331,7 +331,7 @@ proc _build_multiline_regex { multiline index } {
- 		# Support arbitrary followup text on each non-empty line,
- 		# to deal with comments containing containing DejaGnu
- 		# directives.
--		append rexp ".*"
-+		append rexp "\[^\\n\\r\]*"
- 	    }
- 	}
- 	append rexp "\n"

SOURCES/gcc11-detect-sapphirerapids.patch

@@ -1,69 +0,0 @@
-commit 63dd214dce603f4f99e2cb272255b6c2b4308c3d
-Author: Cui,Lili <lili.cui@intel.com>
-Date:   Mon Nov 7 11:25:41 2022 +0800
-
-    Remove AVX512_VP2INTERSECT from PTA_SAPPHIRERAPIDS
-    
-    gcc/ChangeLog:
-    
-            * config/i386/driver-i386.cc (host_detect_local_cpu):
-            Move sapphirerapids out of AVX512_VP2INTERSECT.
-            * config/i386/i386.h: Remove AVX512_VP2INTERSECT from PTA_SAPPHIRERAPIDS
-            * doc/invoke.texi: Remove AVX512_VP2INTERSECT from SAPPHIRERAPIDS
-    
-    (cherry picked from commit d644dfe36d9733c767af62d37250253ced6efd8c)
-
-diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
-index f844a168ddb..90f84aba4ee 100644
---- a/gcc/config/i386/driver-i386.c
-+++ b/gcc/config/i386/driver-i386.c
-@@ -574,15 +574,12 @@ const char *host_detect_local_cpu (int argc, const char **argv)
- 	      /* This is unknown family 0x6 CPU.  */
- 	      if (has_feature (FEATURE_AVX))
- 		{
-+		  /* Assume Tiger Lake */
- 		  if (has_feature (FEATURE_AVX512VP2INTERSECT))
--		    {
--		      if (has_feature (FEATURE_TSXLDTRK))
--			/* Assume Sapphire Rapids.  */
--			cpu = "sapphirerapids";
--		      else
--			/* Assume Tiger Lake */
--			cpu = "tigerlake";
--		    }
-+		    cpu = "tigerlake";
-+		  /* Assume Sapphire Rapids.  */
-+		  else if (has_feature (FEATURE_TSXLDTRK))
-+		    cpu = "sapphirerapids";
- 		  /* Assume Cooper Lake */
- 		  else if (has_feature (FEATURE_AVX512BF16))
- 		    cpu = "cooperlake";
-diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
-index ac0e5da623c..e03279bcf39 100644
---- a/gcc/config/i386/i386.h
-+++ b/gcc/config/i386/i386.h
-@@ -2562,7 +2562,7 @@ constexpr wide_int_bitmask PTA_ICELAKE_SERVER = PTA_ICELAKE_CLIENT
- constexpr wide_int_bitmask PTA_TIGERLAKE = PTA_ICELAKE_CLIENT | PTA_MOVDIRI
-   | PTA_MOVDIR64B | PTA_CLWB | PTA_AVX512VP2INTERSECT | PTA_KL | PTA_WIDEKL;
- constexpr wide_int_bitmask PTA_SAPPHIRERAPIDS = PTA_ICELAKE_SERVER | PTA_MOVDIRI
--  | PTA_MOVDIR64B | PTA_AVX512VP2INTERSECT | PTA_ENQCMD | PTA_CLDEMOTE
-+  | PTA_MOVDIR64B | PTA_ENQCMD | PTA_CLDEMOTE
-   | PTA_PTWRITE | PTA_WAITPKG | PTA_SERIALIZE | PTA_TSXLDTRK | PTA_AMX_TILE
-   | PTA_AMX_INT8 | PTA_AMX_BF16 | PTA_UINTR | PTA_AVXVNNI | PTA_AVX512BF16;
- constexpr wide_int_bitmask PTA_KNL = PTA_BROADWELL | PTA_AVX512PF
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 3419483c532..6b3afb827a5 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -30236,9 +30236,9 @@ Intel sapphirerapids CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, SSE3,
- SSSE3, SSE4.1, SSE4.2, POPCNT, CX16, SAHF, FXSR, AVX, XSAVE, PCLMUL, FSGSBASE,
- RDRND, F16C, AVX2, BMI, BMI2, LZCNT, FMA, MOVBE, HLE, RDSEED, ADCX, PREFETCHW,
- AES, CLFLUSHOPT, XSAVEC, XSAVES, SGX, AVX512F, AVX512VL, AVX512BW, AVX512DQ,
--AVX512CD, PKU, AVX512VBMI, AVX512IFMA, SHA, AVX512VNNI, GFNI, VAES, AVX512VBMI2
-+AVX512CD, PKU, AVX512VBMI, AVX512IFMA, SHA, AVX512VNNI, GFNI, VAES, AVX512VBMI2,
- VPCLMULQDQ, AVX512BITALG, RDPID, AVX512VPOPCNTDQ, PCONFIG, WBNOINVD, CLWB,
--MOVDIRI, MOVDIR64B, AVX512VP2INTERSECT, ENQCMD, CLDEMOTE, PTWRITE, WAITPKG,
-+MOVDIRI, MOVDIR64B, ENQCMD, CLDEMOTE, PTWRITE, WAITPKG,
- SERIALIZE, TSXLDTRK, UINTR, AMX-BF16, AMX-TILE, AMX-INT8, AVX-VNNI and
- AVX512BF16 instruction set support.
- 

SOURCES/gcc11-dg-ice-fixes.patch

@@ -1,83 +0,0 @@
-diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c
-index 8c3884bdc00..141f089d4f8 100644
---- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c
-+++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c
-@@ -1,7 +1,7 @@
- /* Test OpenACC 'kernels' construct decomposition.  */
- 
- /* { dg-additional-options "-fopt-info-omp-all" } */
--/* { dg-additional-options "-fchecking --param=openacc-kernels=decompose" } */
-+/* { dg-additional-options "-fno-report-bug -fchecking --param=openacc-kernels=decompose" } */
- /* { dg-ice "TODO" }
-    { dg-prune-output "during GIMPLE pass: omplower" } */
- 
-diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c
-index 8bf60a9a509..a07e0a42116 100644
---- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c
-+++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c
-@@ -1,6 +1,6 @@
- /* Test OpenACC 'kernels' construct decomposition.  */
- 
--/* { dg-additional-options "-fchecking --param=openacc-kernels=decompose" } */
-+/* { dg-additional-options "-fno-report-bug -fchecking --param=openacc-kernels=decompose" } */
- /* { dg-ice "TODO" }
-    { dg-prune-output "during GIMPLE pass: omplower" } */
- 
-diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C
-index eae0d8c377b..ed37f95e865 100644
---- a/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C
-+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C
-@@ -1,6 +1,6 @@
- // PR c++/52830
- // { dg-do compile { target c++11 } }
--// { dg-additional-options "-fchecking" }
-+// { dg-additional-options "-fchecking -fno-report-bug" }
- // { dg-ice "comptypes" }
- 
- template<bool b> struct eif { typedef void type; };
-diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-88982.C b/gcc/testsuite/g++.dg/cpp0x/vt-88982.C
-index 7a868233d73..45307a63483 100644
---- a/gcc/testsuite/g++.dg/cpp0x/vt-88982.C
-+++ b/gcc/testsuite/g++.dg/cpp0x/vt-88982.C
-@@ -1,6 +1,6 @@
- // PR c++/88982
- // { dg-do compile { target c++11 } }
--// { dg-additional-options "-fchecking" }
-+// { dg-additional-options "-fchecking -fno-report-bug" }
- // { dg-ice "tsubst_pack_expansion" }
- 
- template<typename...Ts> struct A {
-diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C
-index bed5ea0cfc0..cb235bf891a 100644
---- a/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C
-+++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C
-@@ -1,6 +1,6 @@
- // PR c++/88003
- // { dg-do compile { target c++14 } }
--// { dg-additional-options "-fchecking" }
-+// { dg-additional-options "-fchecking -fno-report-bug" }
- // { dg-ice "poplevel_class" }
- 
- auto test() {
-diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C
-index 0cdb400d21c..8f17cca31dd 100644
---- a/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C
-+++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C
-@@ -1,6 +1,6 @@
- // PR c++/87765
- // { dg-do compile { target c++17 } }
--// { dg-additional-options "-fchecking" }
-+// { dg-additional-options "-fchecking -fno-report-bug" }
- // { dg-ice "cxx_eval_constant_expression" }
- 
- template <int N>
-diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla-kernels-decompose-ice-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla-kernels-decompose-ice-1.c
-index 0777b612b63..53abbe2db83 100644
---- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla-kernels-decompose-ice-1.c
-+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla-kernels-decompose-ice-1.c
-@@ -1,4 +1,4 @@
--/* { dg-additional-options "--param=openacc-kernels=decompose" } */
-+/* { dg-additional-options "--param=openacc-kernels=decompose -fno-report-bug" } */
- /* Hopefully, this is the same issue as '../../../gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c'.
-    { dg-ice "TODO" }
-    TODO { dg-prune-output "during GIMPLE pass: omplower" }

SOURCES/gcc11-fortran-fdec-add-missing-indexes.patch

@@ -1,181 +0,0 @@
-From 7001d522d0273658d9e1fb12ca104d56bfcae34d Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 15:06:08 +0000
-Subject: [PATCH 10/10] Fill in missing array dimensions using the lower bound
-
-Use -fdec-add-missing-indexes to enable feature. Also enabled by fdec.
----
- gcc/fortran/lang.opt                  |  8 ++++++++
- gcc/fortran/options.c                 |  1 +
- gcc/fortran/resolve.c                 | 24 ++++++++++++++++++++++++
- gcc/testsuite/gfortran.dg/array_6.f90 | 23 +++++++++++++++++++++++
- gcc/testsuite/gfortran.dg/array_7.f90 | 23 +++++++++++++++++++++++
- gcc/testsuite/gfortran.dg/array_8.f90 | 23 +++++++++++++++++++++++
- 6 files changed, 102 insertions(+)
- create mode 100644 gcc/testsuite/gfortran.dg/array_6.f90
- create mode 100644 gcc/testsuite/gfortran.dg/array_7.f90
- create mode 100644 gcc/testsuite/gfortran.dg/array_8.f90
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 019c798cf09..f27de88ea3f 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -281,6 +281,10 @@ Wmissing-include-dirs
- Fortran
- ; Documented in C/C++
- 
-+Wmissing-index
-+Fortran Var(warn_missing_index) Warning LangEnabledBy(Fortran,Wall)
-+Warn that the lower bound of a missing index will be used.
-+
- Wuse-without-only
- Fortran Var(warn_use_without_only) Warning
- Warn about USE statements that have no ONLY qualifier.
-@@ -460,6 +464,10 @@ fdec
- Fortran Var(flag_dec)
- Enable all DEC language extensions.
- 
-+fdec-add-missing-indexes
-+Fortran Var(flag_dec_add_missing_indexes)
-+Enable the addition of missing indexes using their lower bounds.
-+
- fdec-blank-format-item
- Fortran Var(flag_dec_blank_format_item)
- Enable the use of blank format items in format strings.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index 050f56fdc25..c3b2822685d 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -84,6 +84,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_non_logical_if, value, value);
-   SET_BITFLAG (flag_dec_promotion, value, value);
-   SET_BITFLAG (flag_dec_sequence, value, value);
-+  SET_BITFLAG (flag_dec_add_missing_indexes, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
-index fe7d0cc5944..0efeedab46e 100644
---- a/gcc/fortran/resolve.c
-+++ b/gcc/fortran/resolve.c
-@@ -4806,6 +4806,30 @@ compare_spec_to_ref (gfc_array_ref *ar)
-   if (ar->type == AR_FULL)
-     return true;
- 
-+  if (flag_dec_add_missing_indexes && as->rank > ar->dimen)
-+    {
-+      /* Add in the missing dimensions, assuming they are the lower bound
-+	 of that dimension if not specified.  */
-+      int j;
-+      if (warn_missing_index)
-+	{
-+	  gfc_warning (OPT_Wmissing_index, "Using the lower bound for "
-+		       "unspecified dimensions in array reference at %L",
-+		       &ar->where);
-+	}
-+      /* Other parts of the code iterate ar->start and ar->end from 0 to
-+	 ar->dimen, so it is safe to assume slots from ar->dimen upwards
-+	 are unused (i.e. there are no gaps; the specified indexes are
-+	 contiguous and start at zero.  */
-+      for(j = ar->dimen; j <= as->rank; j++)
-+	{
-+	  ar->start[j] = gfc_copy_expr (as->lower[j]);
-+	  ar->end[j]   = gfc_copy_expr (as->lower[j]);
-+	  ar->dimen_type[j] = DIMEN_ELEMENT;
-+	}
-+      ar->dimen = as->rank;
-+    }
-+
-   if (as->rank != ar->dimen)
-     {
-       gfc_error ("Rank mismatch in array reference at %L (%d/%d)",
-diff --git a/gcc/testsuite/gfortran.dg/array_6.f90 b/gcc/testsuite/gfortran.dg/array_6.f90
-new file mode 100644
-index 00000000000..5c26e18ab3e
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/array_6.f90
-@@ -0,0 +1,23 @@
-+! { dg-do run }
-+! { dg-options "-fdec -Wmissing-index" }!
-+! Checks that under-specified arrays (referencing arrays with fewer
-+! dimensions than the array spec) generates a warning.
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Updated by Mark Eggleston <mark.eggleston@codethink.co.uk>
-+!
-+
-+program under_specified_array
-+    integer chessboard(8,8)
-+    integer chessboard3d(8,8,3:5)
-+    chessboard(3,1) = 5
-+    chessboard(3,2) = 55
-+    chessboard3d(4,1,3) = 6
-+    chessboard3d(4,1,4) = 66
-+    chessboard3d(4,4,3) = 7
-+    chessboard3d(4,4,4) = 77
-+  
-+    if (chessboard(3).ne.5) stop 1  ! { dg-warning "Using the lower bound for unspecified dimensions in array reference" }
-+    if (chessboard3d(4).ne.6) stop 2  ! { dg-warning "Using the lower bound for unspecified dimensions in array reference" }
-+    if (chessboard3d(4,4).ne.7) stop 3  ! { dg-warning "Using the lower bound for unspecified dimensions in array reference" }
-+end program
-diff --git a/gcc/testsuite/gfortran.dg/array_7.f90 b/gcc/testsuite/gfortran.dg/array_7.f90
-new file mode 100644
-index 00000000000..5588a5bd02d
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/array_7.f90
-@@ -0,0 +1,23 @@
-+! { dg-do run }
-+! { dg-options "-fdec-add-missing-indexes -Wmissing-index" }!
-+! Checks that under-specified arrays (referencing arrays with fewer
-+! dimensions than the array spec) generates a warning.
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Updated by Mark Eggleston <mark.eggleston@codethink.co.uk>
-+!
-+
-+program under_specified_array
-+    integer chessboard(8,8)
-+    integer chessboard3d(8,8,3:5)
-+    chessboard(3,1) = 5
-+    chessboard(3,2) = 55
-+    chessboard3d(4,1,3) = 6
-+    chessboard3d(4,1,4) = 66
-+    chessboard3d(4,4,3) = 7
-+    chessboard3d(4,4,4) = 77
-+  
-+    if (chessboard(3).ne.5) stop 1  ! { dg-warning "Using the lower bound for unspecified dimensions in array reference" }
-+    if (chessboard3d(4).ne.6) stop 2  ! { dg-warning "Using the lower bound for unspecified dimensions in array reference" }
-+    if (chessboard3d(4,4).ne.7) stop 3  ! { dg-warning "Using the lower bound for unspecified dimensions in array reference" }
-+end program
-diff --git a/gcc/testsuite/gfortran.dg/array_8.f90 b/gcc/testsuite/gfortran.dg/array_8.f90
-new file mode 100644
-index 00000000000..f0d2ef5e37d
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/array_8.f90
-@@ -0,0 +1,23 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-add-missing-indexes" }!
-+! Checks that under-specified arrays (referencing arrays with fewer
-+! dimensions than the array spec) generates a warning.
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Updated by Mark Eggleston <mark.eggleston@codethink.co.uk>
-+!
-+
-+program under_specified_array
-+    integer chessboard(8,8)
-+    integer chessboard3d(8,8,3:5)
-+    chessboard(3,1) = 5
-+    chessboard(3,2) = 55
-+    chessboard3d(4,1,3) = 6
-+    chessboard3d(4,1,4) = 66
-+    chessboard3d(4,4,3) = 7
-+    chessboard3d(4,4,4) = 77
-+  
-+    if (chessboard(3).ne.5) stop 1  ! { dg-error "Rank mismatch" }
-+    if (chessboard3d(4).ne.6) stop 2  ! { dg-error "Rank mismatch" }
-+    if (chessboard3d(4,4).ne.7) stop 3  ! { dg-error "Rank mismatch" }
-+end program
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-duplicates.patch

@@ -1,215 +0,0 @@
-From 23b1fcb104c666429451ffaf936f8da5fcd3d43a Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 12:29:47 +0000
-Subject: [PATCH 01/10] Allow duplicate declarations.
-
-Enabled by -fdec-duplicates and -fdec.
-
-Some fixes by Jim MacArthur <jim.macarthur@codethink.co.uk>
-Addition of -fdec-duplicates by Mark Eggleston <mark.eggleston@codethink.com>
----
- gcc/fortran/lang.opt                          |  4 ++++
- gcc/fortran/options.c                         |  1 +
- gcc/fortran/symbol.c                          | 21 +++++++++++++++++--
- .../gfortran.dg/duplicate_type_4.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_5.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_6.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_7.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_8.f90          | 12 +++++++++++
- .../gfortran.dg/duplicate_type_9.f90          | 12 +++++++++++
- 9 files changed, 100 insertions(+), 2 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_4.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_5.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_6.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_7.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_8.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_9.f90
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 2b1977c523b..52bd522051e 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -469,6 +469,10 @@ Fortran Var(flag_dec_char_conversions)
- Enable the use of character literals in assignments and data statements
- for non-character variables.
- 
-+fdec-duplicates
-+Fortran Var(flag_dec_duplicates)
-+Allow varibles to be duplicated in the type specification matches.
-+
- fdec-include
- Fortran Var(flag_dec_include)
- Enable legacy parsing of INCLUDE as statement.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index 3a0b98bf1ec..f19ba87f8a0 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -77,6 +77,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_format_defaults, value, value);
-   SET_BITFLAG (flag_dec_blank_format_item, value, value);
-   SET_BITFLAG (flag_dec_char_conversions, value, value);
-+  SET_BITFLAG (flag_dec_duplicates, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
-index 3b988d1be22..9843175cc2a 100644
---- a/gcc/fortran/symbol.c
-+++ b/gcc/fortran/symbol.c
-@@ -1995,6 +1995,8 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where)
-   if (sym->attr.result && type == BT_UNKNOWN && sym->ns->proc_name)
-     type = sym->ns->proc_name->ts.type;
- 
-+  flavor = sym->attr.flavor;
-+
-   if (type != BT_UNKNOWN && !(sym->attr.function && sym->attr.implicit_type)
-       && !(gfc_state_stack->previous && gfc_state_stack->previous->previous
- 	   && gfc_state_stack->previous->previous->state == COMP_SUBMODULE)
-@@ -2007,6 +2009,23 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where)
-       else if (sym->attr.function && sym->attr.result)
- 	gfc_error ("Symbol %qs at %L already has basic type of %s",
- 		   sym->ns->proc_name->name, where, gfc_basic_typename (type));
-+      else if (flag_dec_duplicates)
-+	{
-+	  /* Ignore temporaries and class/procedure names */
-+	  if (sym->ts.type == BT_DERIVED || sym->ts.type == BT_CLASS
-+	      || sym->ts.type == BT_PROCEDURE)
-+	    return false;
-+
-+	  if (gfc_compare_types (&sym->ts, ts)
-+	      && (flavor == FL_UNKNOWN || flavor == FL_VARIABLE
-+	      || flavor == FL_PROCEDURE))
-+	    {
-+	      return gfc_notify_std (GFC_STD_LEGACY,
-+				     "Symbol '%qs' at %L already has "
-+				     "basic type of %s", sym->name, where,
-+				     gfc_basic_typename (type));
-+	    }
-+	}
-       else
- 	gfc_error ("Symbol %qs at %L already has basic type of %s", sym->name,
- 		   where, gfc_basic_typename (type));
-@@ -2020,8 +2039,6 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where)
-       return false;
-     }
- 
--  flavor = sym->attr.flavor;
--
-   if (flavor == FL_PROGRAM || flavor == FL_BLOCK_DATA || flavor == FL_MODULE
-       || flavor == FL_LABEL
-       || (flavor == FL_PROCEDURE && sym->attr.subroutine)
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_4.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_4.f90
-new file mode 100644
-index 00000000000..cdd29ea8846
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_4.f90
-@@ -0,0 +1,13 @@
-+! { dg-do compile }
-+! { dg-options "-std=f95" }
-+
-+! PR fortran/30239
-+! Check for errors when a symbol gets declared a type twice, even if it
-+! is the same.
-+
-+INTEGER FUNCTION foo ()
-+  IMPLICIT NONE
-+  INTEGER :: x
-+  INTEGER :: x ! { dg-error "basic type of" }
-+  x = 42
-+END FUNCTION foo
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_5.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_5.f90
-new file mode 100644
-index 00000000000..00f931809aa
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_5.f90
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+program test
-+  implicit none
-+  integer :: x
-+  integer :: x
-+  x = 42
-+  if (x /= 42) stop 1
-+end program test
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_6.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_6.f90
-new file mode 100644
-index 00000000000..f0df27e323c
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_6.f90
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-std=legacy -fdec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+program test
-+  implicit none
-+  integer :: x
-+  integer :: x
-+  x = 42
-+  if (x /= 42) stop 1
-+end program test
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_7.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_7.f90
-new file mode 100644
-index 00000000000..f32472ff586
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_7.f90
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+program test
-+  implicit none
-+  integer :: x
-+  integer :: x! { dg-warning "Legacy Extension" }
-+  x = 42
-+  if (x /= 42) stop 1
-+end program test
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_8.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_8.f90
-new file mode 100644
-index 00000000000..23c94add179
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_8.f90
-@@ -0,0 +1,12 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+integer function foo ()
-+  implicit none
-+  integer :: x
-+  integer :: x ! { dg-error "basic type of" }
-+  x = 42
-+end function foo
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_9.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_9.f90
-new file mode 100644
-index 00000000000..d5edee4d8ee
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_9.f90
-@@ -0,0 +1,12 @@
-+! { dg-do compile }
-+! { dg-options "-fdec-duplicates -fno-dec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+integer function foo ()
-+  implicit none
-+  integer :: x
-+  integer :: x ! { dg-error "basic type of" }
-+  x = 42
-+end function foo
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-ichar.patch

@@ -1,78 +0,0 @@
-From f883ac209b0feea860354cb4ef7ff06dc8063fab Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 12:53:35 +0000
-Subject: [PATCH 03/10] Allow more than one character as argument to ICHAR
-
-Use -fdec to enable.
----
- gcc/fortran/check.c                           |  2 +-
- gcc/fortran/simplify.c                        |  4 ++--
- .../gfortran.dg/dec_ichar_with_string_1.f     | 21 +++++++++++++++++++
- 3 files changed, 24 insertions(+), 3 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_ichar_with_string_1.f
-
-diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
-index 82db8e4e1b2..623c1cc470e 100644
---- a/gcc/fortran/check.c
-+++ b/gcc/fortran/check.c
-@@ -3157,7 +3157,7 @@ gfc_check_ichar_iachar (gfc_expr *c, gfc_expr *kind)
-   else
-     return true;
- 
--  if (i != 1)
-+  if (i != 1 && !flag_dec)
-     {
-       gfc_error ("Argument of %s at %L must be of length one",
- 		 gfc_current_intrinsic, &c->where);
-diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
-index 23317a2e2d9..9900572424f 100644
---- a/gcc/fortran/simplify.c
-+++ b/gcc/fortran/simplify.c
-@@ -3261,7 +3261,7 @@ gfc_simplify_iachar (gfc_expr *e, gfc_expr *kind)
-   if (e->expr_type != EXPR_CONSTANT)
-     return NULL;
- 
--  if (e->value.character.length != 1)
-+  if (e->value.character.length != 1 && !flag_dec)
-     {
-       gfc_error ("Argument of IACHAR at %L must be of length one", &e->where);
-       return &gfc_bad_expr;
-@@ -3459,7 +3459,7 @@ gfc_simplify_ichar (gfc_expr *e, gfc_expr *kind)
-   if (e->expr_type != EXPR_CONSTANT)
-     return NULL;
- 
--  if (e->value.character.length != 1)
-+  if (e->value.character.length != 1 && !flag_dec)
-     {
-       gfc_error ("Argument of ICHAR at %L must be of length one", &e->where);
-       return &gfc_bad_expr;
-diff --git a/gcc/testsuite/gfortran.dg/dec_ichar_with_string_1.f b/gcc/testsuite/gfortran.dg/dec_ichar_with_string_1.f
-new file mode 100644
-index 00000000000..85efccecc0f
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_ichar_with_string_1.f
-@@ -0,0 +1,21 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test ICHAR and IACHAR with more than one character as argument
-+!
-+! Test case contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM ichar_more_than_one_character
-+          CHARACTER*4 st/'Test'/
-+          INTEGER i
-+
-+          i = ICHAR(st)
-+          if (i.NE.84) STOP 1
-+          i = IACHAR(st)
-+          if (i.NE.84) STOP 2
-+          i = ICHAR('Test')
-+          if (i.NE.84) STOP 3
-+          i = IACHAR('Test')
-+          if (i.NE.84) STOP 4
-+        END
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-non-integer-index.patch

@@ -1,158 +0,0 @@
-From 67aef262311d6a746786ee0f59748ccaa7e1e711 Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 13:09:54 +0000
-Subject: [PATCH 04/10] Allow non-integer substring indexes
-
-Use -fdec-non-integer-index compiler flag to enable. Also enabled by -fdec.
----
- gcc/fortran/lang.opt                          |  4 ++++
- gcc/fortran/options.c                         |  1 +
- gcc/fortran/resolve.c                         | 20 +++++++++++++++++++
- .../dec_not_integer_substring_indexes_1.f     | 18 +++++++++++++++++
- .../dec_not_integer_substring_indexes_2.f     | 18 +++++++++++++++++
- .../dec_not_integer_substring_indexes_3.f     | 18 +++++++++++++++++
- 6 files changed, 79 insertions(+)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_3.f
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index c4da248f07c..d527c106bd6 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -489,6 +489,10 @@ fdec-math
- Fortran Var(flag_dec_math)
- Enable legacy math intrinsics for compatibility.
- 
-+fdec-non-integer-index
-+Fortran Var(flag_dec_non_integer_index)
-+Enable support for non-integer substring indexes.
-+
- fdec-structure
- Fortran Var(flag_dec_structure)
- Enable support for DEC STRUCTURE/RECORD.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index f19ba87f8a0..9a042f64881 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -78,6 +78,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_blank_format_item, value, value);
-   SET_BITFLAG (flag_dec_char_conversions, value, value);
-   SET_BITFLAG (flag_dec_duplicates, value, value);
-+  SET_BITFLAG (flag_dec_non_integer_index, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
-index 4b90cb59902..bc0df0fdb99 100644
---- a/gcc/fortran/resolve.c
-+++ b/gcc/fortran/resolve.c
-@@ -5131,6 +5131,16 @@ gfc_resolve_substring (gfc_ref *ref, bool *equal_length)
-       if (!gfc_resolve_expr (ref->u.ss.start))
- 	return false;
- 
-+      /* In legacy mode, allow non-integer string indexes by converting */
-+      if (flag_dec_non_integer_index && ref->u.ss.start->ts.type != BT_INTEGER
-+	  && gfc_numeric_ts (&ref->u.ss.start->ts))
-+	{
-+	  gfc_typespec t;
-+	  t.type = BT_INTEGER;
-+	  t.kind = ref->u.ss.start->ts.kind;
-+	  gfc_convert_type_warn (ref->u.ss.start, &t, 2, 1);
-+	}
-+
-       if (ref->u.ss.start->ts.type != BT_INTEGER)
- 	{
- 	  gfc_error ("Substring start index at %L must be of type INTEGER",
-@@ -5160,6 +5170,16 @@ gfc_resolve_substring (gfc_ref *ref, bool *equal_length)
-       if (!gfc_resolve_expr (ref->u.ss.end))
- 	return false;
- 
-+      /* Non-integer string index endings, as for start */
-+      if (flag_dec_non_integer_index && ref->u.ss.end->ts.type != BT_INTEGER
-+	  && gfc_numeric_ts (&ref->u.ss.end->ts))
-+	{
-+	  gfc_typespec t;
-+	  t.type = BT_INTEGER;
-+	  t.kind = ref->u.ss.end->ts.kind;
-+	  gfc_convert_type_warn (ref->u.ss.end, &t, 2, 1);
-+	}
-+
-       if (ref->u.ss.end->ts.type != BT_INTEGER)
- 	{
- 	  gfc_error ("Substring end index at %L must be of type INTEGER",
-diff --git a/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_1.f b/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_1.f
-new file mode 100644
-index 00000000000..0be28abaa4b
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_1.f
-@@ -0,0 +1,18 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test not integer substring indexes
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM not_integer_substring_indexes
-+          CHARACTER*5 st/'Tests'/
-+          REAL ir/1.0/
-+          REAL ir2/4.0/
-+
-+          if (st(ir:4).ne.'Test') stop 1
-+          if (st(1:ir2).ne.'Test') stop 2
-+          if (st(1.0:4).ne.'Test') stop 3
-+          if (st(1:4.0).ne.'Test') stop 4
-+          if (st(2.5:4).ne.'est') stop 5
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_2.f b/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_2.f
-new file mode 100644
-index 00000000000..3cf05296d0c
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_2.f
-@@ -0,0 +1,18 @@
-+! { dg-do run }
-+! { dg-options "-fdec-non-integer-index" }
-+!
-+! Test not integer substring indexes
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM not_integer_substring_indexes
-+          CHARACTER*5 st/'Tests'/
-+          REAL ir/1.0/
-+          REAL ir2/4.0/
-+
-+          if (st(ir:4).ne.'Test') stop 1
-+          if (st(1:ir2).ne.'Test') stop 2
-+          if (st(1.0:4).ne.'Test') stop 3
-+          if (st(1:4.0).ne.'Test') stop 4
-+          if (st(2.5:4).ne.'est') stop 5
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_3.f b/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_3.f
-new file mode 100644
-index 00000000000..703de995897
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_not_integer_substring_indexes_3.f
-@@ -0,0 +1,18 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-non-integer-index" }
-+!
-+! Test not integer substring indexes
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM not_integer_substring_indexes
-+          CHARACTER*5 st/'Tests'/
-+          REAL ir/1.0/
-+          REAL ir2/4.0/
-+
-+          if (st(ir:4).ne.'Test') stop 1 ! { dg-error "Substring start index" }
-+          if (st(1:ir2).ne.'Test') stop 2 ! { dg-error "Substring end index" }
-+          if (st(1.0:4).ne.'Test') stop 3 ! { dg-error "Substring start index" }
-+          if (st(1:4.0).ne.'Test') stop 4 ! { dg-error "Substring end index" }
-+          if (st(2.5:4).ne.'est') stop 5 ! { dg-error "Substring start index" }
-+        END
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-non-logical-if.patch

@@ -1,378 +0,0 @@
-From cc87ddb841017bb0976b05091733609ee17d7f05 Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 13:15:17 +0000
-Subject: [PATCH 07/10] Allow non-logical expressions in IF statements
-
-Use -fdec-non-logical-if to enable feature. Also enabled using -fdec.
----
- gcc/fortran/lang.opt                          |  4 ++
- gcc/fortran/options.c                         |  1 +
- gcc/fortran/resolve.c                         | 60 ++++++++++++++++---
- ...gical_expressions_if_statements_blocks_1.f | 25 ++++++++
- ...gical_expressions_if_statements_blocks_2.f | 25 ++++++++
- ...gical_expressions_if_statements_blocks_3.f | 25 ++++++++
- ...gical_expressions_if_statements_blocks_4.f | 45 ++++++++++++++
- ...gical_expressions_if_statements_blocks_5.f | 45 ++++++++++++++
- ...gical_expressions_if_statements_blocks_6.f | 45 ++++++++++++++
- 9 files changed, 266 insertions(+), 9 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 4a269ebb22d..d886c2f33ed 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -497,6 +497,10 @@ fdec-override-kind
- Fortran Var(flag_dec_override_kind)
- Enable support for per variable kind specification.
- 
-+fdec-non-logical-if
-+Fortran Var(flag_dec_non_logical_if)
-+Enable support for non-logical expressions in if statements.
-+
- fdec-old-init
- Fortran Var(flag_dec_old_init)
- Enable support for old style initializers in derived types.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index edbab483b36..a946c86790a 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -81,6 +81,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_non_integer_index, value, value);
-   SET_BITFLAG (flag_dec_old_init, value, value);
-   SET_BITFLAG (flag_dec_override_kind, value, value);
-+  SET_BITFLAG (flag_dec_non_logical_if, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
-index bc0df0fdb99..07dd039f3bf 100644
---- a/gcc/fortran/resolve.c
-+++ b/gcc/fortran/resolve.c
-@@ -10789,10 +10789,31 @@ gfc_resolve_blocks (gfc_code *b, gfc_namespace *ns)
-       switch (b->op)
- 	{
- 	case EXEC_IF:
--	  if (t && b->expr1 != NULL
--	      && (b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0))
--	    gfc_error ("IF clause at %L requires a scalar LOGICAL expression",
--		       &b->expr1->where);
-+	  if (t && b->expr1 != NULL)
-+	    {
-+	      if (flag_dec_non_logical_if && b->expr1->ts.type != BT_LOGICAL)
-+		{
-+		  gfc_expr* cast;
-+		  cast = gfc_ne (b->expr1,
-+				 gfc_get_int_expr (1, &gfc_current_locus, 0),
-+				 INTRINSIC_NE);
-+		  if (cast == NULL)
-+		    gfc_internal_error ("gfc_resolve_blocks(): Failed to cast "
-+					"to LOGICAL in IF");
-+		  b->expr1 = cast;
-+		  if (warn_conversion_extra)
-+		    {
-+		      gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in"
-+				   " IF statement condition %L will be true if"
-+				   " it evaluates to nonzero",
-+				   &b->expr1->where);
-+		    }
-+		}
-+
-+	      if ((b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0))
-+		gfc_error ("IF clause at %L requires a scalar LOGICAL "
-+			   "expression", &b->expr1->where);
-+	    }
- 	  break;
- 
- 	case EXEC_WHERE:
-@@ -12093,11 +12114,32 @@ start:
- 	  break;
- 
- 	case EXEC_IF:
--	  if (t && code->expr1 != NULL
--	      && (code->expr1->ts.type != BT_LOGICAL
--		  || code->expr1->rank != 0))
--	    gfc_error ("IF clause at %L requires a scalar LOGICAL expression",
--		       &code->expr1->where);
-+	  if (t && code->expr1 != NULL)
-+	    {
-+	      if (flag_dec_non_logical_if
-+		  && code->expr1->ts.type != BT_LOGICAL)
-+		{
-+		  gfc_expr* cast;
-+		  cast = gfc_ne (code->expr1,
-+				 gfc_get_int_expr (1, &gfc_current_locus, 0),
-+				 INTRINSIC_NE);
-+		  if (cast == NULL)
-+		    gfc_internal_error ("gfc_resolve_code(): Failed to cast "
-+					"to LOGICAL in IF");
-+		  code->expr1 = cast;
-+		  if (warn_conversion_extra)
-+		    {
-+		      gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in"
-+				   " IF statement condition %L will be true if"
-+				   " it evaluates to nonzero",
-+				   &code->expr1->where);
-+		    }
-+		}
-+
-+	      if (code->expr1->ts.type != BT_LOGICAL || code->expr1->rank != 0)
-+		gfc_error ("IF clause at %L requires a scalar LOGICAL "
-+			   "expression", &code->expr1->where);
-+	    }
- 	  break;
- 
- 	case EXEC_CALL:
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
-new file mode 100644
-index 00000000000..0101db893ca
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
-@@ -0,0 +1,25 @@
-+! { dg-do run }
-+! { dg-options "-fdec -Wconversion-extra" }
-+!
-+! Allow logical expressions in if statements and blocks
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_exp_if_st_bl
-+          INTEGER ipos/1/
-+          INTEGER ineg/0/
-+
-+          ! Test non logical variables
-+          if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" }
-+          if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if statements
-+          if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if blocks
-+          if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" }
-+            STOP 4
-+          endif
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
-new file mode 100644
-index 00000000000..876f4e09508
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
-@@ -0,0 +1,25 @@
-+! { dg-do run }
-+! { dg-options "-fdec-non-logical-if -Wconversion-extra" }
-+!
-+! Allow logical expressions in if statements and blocks
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_exp_if_st_bl
-+          INTEGER ipos/1/
-+          INTEGER ineg/0/
-+
-+          ! Test non logical variables
-+          if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" }
-+          if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if statements
-+          if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if blocks
-+          if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" }
-+            STOP 4
-+          endif
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
-new file mode 100644
-index 00000000000..35cb4c51b8d
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
-@@ -0,0 +1,25 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-non-logical-if" }
-+!
-+! Allow logical expressions in if statements and blocks
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_exp_if_st_bl
-+          INTEGER ipos/1/
-+          INTEGER ineg/0/
-+
-+          ! Test non logical variables
-+          if (ineg) STOP 1 ! { dg-error "IF clause at" }
-+          if (0) STOP 2 ! { dg-error "IF clause at" }
-+
-+          ! Test non logical expressions in if statements
-+          if (MOD(ipos, 1)) STOP 3 ! { dg-error "IF clause at" }
-+
-+          ! Test non logical expressions in if blocks
-+          if (MOD(2 * ipos, 2)) then ! { dg-error "IF clause at" }
-+            STOP 4
-+          endif
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
-new file mode 100644
-index 00000000000..7b60b60827f
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
-@@ -0,0 +1,45 @@
-+! { dg-do run }
-+! { dg-options "-fdec -Wconversion-extra" }
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       function othersub1()
-+        integer*4 othersub1
-+        othersub1 = 9
-+       end
-+
-+       function othersub2()
-+        integer*4 othersub2
-+        othersub2 = 0
-+       end
-+
-+       program MAIN
-+        integer*4 othersub1
-+        integer*4 othersub2
-+        integer a /1/
-+        integer b /2/        
-+ 
-+        if (othersub1()) then ! { dg-warning "if it evaluates to nonzero" }
-+           write(*,*) "OK"
-+        else
-+           stop 1
-+        end if
-+        if (othersub2()) then ! { dg-warning "if it evaluates to nonzero" }
-+           stop 2
-+        else
-+           write(*,*) "OK"
-+        end if
-+        if (a-b) then ! { dg-warning "if it evaluates to nonzero" }
-+           write(*,*) "OK"
-+        else
-+           stop 3
-+        end if
-+        if (b-(a+1)) then ! { dg-warning "if it evaluates to nonzero" }
-+           stop 3
-+        else
-+           write(*,*) "OK"
-+        end if
-+       end
-+
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
-new file mode 100644
-index 00000000000..80336f48ca1
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
-@@ -0,0 +1,45 @@
-+! { dg-do run }
-+! { dg-options "-fdec-non-logical-if -Wconversion-extra" }
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       function othersub1()
-+        integer*4 othersub1
-+        othersub1 = 9
-+       end
-+
-+       function othersub2()
-+        integer*4 othersub2
-+        othersub2 = 0
-+       end
-+
-+       program MAIN
-+        integer*4 othersub1
-+        integer*4 othersub2
-+        integer a /1/
-+        integer b /2/        
-+ 
-+        if (othersub1()) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           write(*,*) "OK"
-+        else
-+           stop 1
-+        end if
-+        if (othersub2()) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           stop 2
-+        else
-+           write(*,*) "OK"
-+        end if
-+        if (a-b) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           write(*,*) "OK"
-+        else
-+           stop 3
-+        end if
-+        if (b-(a+1)) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           stop 3
-+        else
-+           write(*,*) "OK"
-+        end if
-+       end
-+
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
-new file mode 100644
-index 00000000000..e1125ca717a
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
-@@ -0,0 +1,45 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-non-logical-if" }
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       function othersub1()
-+        integer*4 othersub1
-+        othersub1 = 9
-+       end
-+
-+       function othersub2()
-+        integer*4 othersub2
-+        othersub2 = 0
-+       end
-+
-+       program MAIN
-+        integer*4 othersub1
-+        integer*4 othersub2
-+        integer a /1/
-+        integer b /2/        
-+ 
-+        if (othersub1()) then ! { dg-error "IF clause at" }
-+           write(*,*) "OK"
-+        else
-+           stop 1
-+        end if
-+        if (othersub2()) then ! { dg-error "IF clause at" }
-+           stop 2
-+        else
-+           write(*,*) "OK"
-+        end if
-+        if (a-b) then ! { dg-error "IF clause at" }
-+           write(*,*) "OK"
-+        else
-+           stop 3
-+        end if
-+        if (b-(a+1)) then ! { dg-error "IF clause at" }
-+           stop 3
-+        else
-+           write(*,*) "OK"
-+        end if
-+       end
-+
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-old-init.patch

@@ -1,185 +0,0 @@
-From 8bcc0f85ed1718c0dd9033ad4a34df181aabaffe Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 13:11:06 +0000
-Subject: [PATCH 05/10] Allow old-style initializers in derived types
-
-This allows simple declarations in derived types and structures, such as:
-    LOGICAL*1      NIL      /0/
-Only single value expressions are allowed at the moment.
-
-Use -fdec-old-init to enable. Also enabled by -fdec.
----
- gcc/fortran/decl.c                            | 27 +++++++++++++++----
- gcc/fortran/lang.opt                          |  4 +++
- gcc/fortran/options.c                         |  1 +
- ...ec_derived_types_initialised_old_style_1.f | 25 +++++++++++++++++
- ...ec_derived_types_initialised_old_style_2.f | 25 +++++++++++++++++
- ...ec_derived_types_initialised_old_style_3.f | 26 ++++++++++++++++++
- 6 files changed, 103 insertions(+), 5 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_3.f
-
-diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
-index 723915822f3..5c8c1b7981b 100644
---- a/gcc/fortran/decl.c
-+++ b/gcc/fortran/decl.c
-@@ -2827,12 +2827,29 @@ variable_decl (int elem)
-          but not components of derived types.  */
-       else if (gfc_current_state () == COMP_DERIVED)
- 	{
--	  gfc_error ("Invalid old style initialization for derived type "
--		     "component at %C");
--	  m = MATCH_ERROR;
--	  goto cleanup;
-+	  if (flag_dec_old_init)
-+	    {
-+	      /* Attempt to match an old-style initializer which is a simple
-+		 integer or character expression; this will not work with
-+		 multiple values. */
-+	      m = gfc_match_init_expr (&initializer);
-+	      if (m == MATCH_ERROR)
-+		goto cleanup;
-+	      else if (m == MATCH_YES)
-+		{
-+		  m = gfc_match ("/");
-+		  if (m != MATCH_YES)
-+		    goto cleanup;
-+		}
-+	    }
-+	  else
-+	    {
-+	      gfc_error ("Invalid old style initialization for derived type "
-+			 "component at %C");
-+	      m = MATCH_ERROR;
-+	      goto cleanup;
-+	    }
- 	}
--
-       /* For structure components, read the initializer as a special
-          expression and let the rest of this function apply the initializer
-          as usual.  */
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index d527c106bd6..25cc948699b 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -493,6 +493,10 @@ fdec-non-integer-index
- Fortran Var(flag_dec_non_integer_index)
- Enable support for non-integer substring indexes.
- 
-+fdec-old-init
-+Fortran Var(flag_dec_old_init)
-+Enable support for old style initializers in derived types.
-+
- fdec-structure
- Fortran Var(flag_dec_structure)
- Enable support for DEC STRUCTURE/RECORD.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index 9a042f64881..d6bd36c3a8a 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -79,6 +79,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_char_conversions, value, value);
-   SET_BITFLAG (flag_dec_duplicates, value, value);
-   SET_BITFLAG (flag_dec_non_integer_index, value, value);
-+  SET_BITFLAG (flag_dec_old_init, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_1.f b/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_1.f
-new file mode 100644
-index 00000000000..eac4f9bfcf1
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_1.f
-@@ -0,0 +1,25 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test old style initializers in derived types
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM spec_in_var
-+          TYPE STRUCT1
-+            INTEGER*4      ID       /8/
-+            INTEGER*4      TYPE     /5/
-+            INTEGER*8      DEFVAL   /0/
-+            CHARACTER*(5)  NAME     /'tests'/
-+            LOGICAL*1      NIL      /0/
-+          END TYPE STRUCT1
-+
-+          TYPE (STRUCT1) SINST
-+
-+          IF(SINST%ID.NE.8) STOP 1
-+          IF(SINST%TYPE.NE.5) STOP 2
-+          IF(SINST%DEFVAL.NE.0) STOP 3
-+          IF(SINST%NAME.NE.'tests') STOP 4
-+          IF(SINST%NIL) STOP 5
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_2.f b/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_2.f
-new file mode 100644
-index 00000000000..d904c8b2974
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_2.f
-@@ -0,0 +1,25 @@
-+! { dg-do run }
-+! { dg-options "-std=legacy -fdec-old-init" }
-+!
-+! Test old style initializers in derived types
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM spec_in_var
-+          TYPE STRUCT1
-+            INTEGER*4      ID       /8/
-+            INTEGER*4      TYPE     /5/
-+            INTEGER*8      DEFVAL   /0/
-+            CHARACTER*(5)  NAME     /'tests'/
-+            LOGICAL*1      NIL      /0/
-+          END TYPE STRUCT1
-+
-+          TYPE (STRUCT1) SINST
-+
-+          IF(SINST%ID.NE.8) STOP 1
-+          IF(SINST%TYPE.NE.5) STOP 2
-+          IF(SINST%DEFVAL.NE.0) STOP 3
-+          IF(SINST%NAME.NE.'tests') STOP 4
-+          IF(SINST%NIL) STOP 5
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_3.f b/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_3.f
-new file mode 100644
-index 00000000000..58c2b4b66cf
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_derived_types_initialised_old_style_3.f
-@@ -0,0 +1,26 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -fdec -fno-dec-old-init" }
-+!
-+! Test old style initializers in derived types
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+        PROGRAM spec_in_var
-+          TYPE STRUCT1
-+            INTEGER*4      ID       /8/ ! { dg-error "Invalid old style initialization" }
-+            INTEGER*4      TYPE     /5/ ! { dg-error "Invalid old style initialization" }
-+            INTEGER*8      DEFVAL   /0/ ! { dg-error "Invalid old style initialization" }
-+            CHARACTER*(5)  NAME     /'tests'/ ! { dg-error "Invalid old style initialization" }
-+            LOGICAL*1      NIL      /0/ ! { dg-error "Invalid old style initialization" }
-+          END TYPE STRUCT1
-+
-+          TYPE (STRUCT1) SINST
-+
-+          IF(SINST%ID.NE.8) STOP 1 ! { dg-error "'id' at \\(1\\) is not a member" }
-+          IF(SINST%TYPE.NE.5) STOP 2 ! { dg-error "'type' at \\(1\\) is not a member" }
-+          IF(SINST%DEFVAL.NE.0) STOP 3  ! { dg-error "'defval' at \\(1\\) is not a member" }
-+          IF(SINST%NAME.NE.'tests') STOP 4 ! { dg-error "'name' at \\(1\\) is not a member" }
-+          IF(SINST%NIL) STOP 5 ! { dg-error "'nil' at \\(1\\) is not a member" }
-+        END
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-override-kind.patch

@@ -1,588 +0,0 @@
-From 786869fd62813e80da9b6545a295d53c36275c19 Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 13:12:14 +0000
-Subject: [PATCH 06/10] Allow string length and kind to be specified on a per
- variable basis.
-
-This allows kind/length to be mixed with array specification in
-declarations.
-
-e.g.
-
-      INTEGER*4 x*2, y*8
-      CHARACTER names*20(10)
-      REAL v(100)*8, vv*4(50)
-
-The per-variable size overrides the kind or length specified for the type.
-
-Use -fdec-override-kind to enable. Also enabled by -fdec.
-
-Note: this feature is a merger of two previously separate features.
-
-Now accepts named constants as kind parameters:
-
-      INTEGER A
-      PARAMETER (A=2)
-      INTEGER B*(A)
-
-Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-
-Now rejects invalid kind parameters and prints error messages:
-
-      INTEGER X*3
-
-caused an internal compiler error.
-
-Contributed by Mark Eggleston <mark.eggleston@codethink.com>
----
- gcc/fortran/decl.c                            | 156 ++++++++++++++----
- gcc/fortran/lang.opt                          |   4 +
- gcc/fortran/options.c                         |   1 +
- .../dec_mixed_char_array_declaration_1.f      |  13 ++
- .../dec_mixed_char_array_declaration_2.f      |  13 ++
- .../dec_mixed_char_array_declaration_3.f      |  13 ++
- .../gfortran.dg/dec_spec_in_variable_1.f      |  31 ++++
- .../gfortran.dg/dec_spec_in_variable_2.f      |  31 ++++
- .../gfortran.dg/dec_spec_in_variable_3.f      |  31 ++++
- .../gfortran.dg/dec_spec_in_variable_4.f      |  14 ++
- .../gfortran.dg/dec_spec_in_variable_5.f      |  19 +++
- .../gfortran.dg/dec_spec_in_variable_6.f      |  19 +++
- .../gfortran.dg/dec_spec_in_variable_7.f      |  15 ++
- .../gfortran.dg/dec_spec_in_variable_8.f      |  14 ++
- 14 files changed, 340 insertions(+), 34 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
-
-diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
-index 5c8c1b7981b..f7dc9d8263d 100644
---- a/gcc/fortran/decl.c
-+++ b/gcc/fortran/decl.c
-@@ -1213,6 +1213,54 @@ syntax:
-   return MATCH_ERROR;
- }
- 
-+/* This matches the nonstandard kind given after a variable name, like:
-+   INTEGER x*2, y*4
-+   The per-variable kind will override any kind given in the type
-+   declaration.
-+*/
-+
-+static match
-+match_per_symbol_kind (int *length)
-+{
-+  match m;
-+  gfc_expr *expr = NULL;
-+
-+  m = gfc_match_char ('*');
-+  if (m != MATCH_YES)
-+    return m;
-+
-+  m = gfc_match_small_literal_int (length, NULL);
-+  if (m == MATCH_YES || m == MATCH_ERROR)
-+    return m;
-+
-+  if (gfc_match_char ('(') == MATCH_NO)
-+    return MATCH_ERROR;
-+
-+  m = gfc_match_expr (&expr);
-+  if (m == MATCH_YES)
-+    {
-+      m = MATCH_ERROR; // Assume error
-+      if (gfc_expr_check_typed (expr, gfc_current_ns, false))
-+	{
-+	  if ((expr->expr_type == EXPR_CONSTANT)
-+	      && (expr->ts.type == BT_INTEGER))
-+	    {
-+	      *length = mpz_get_si(expr->value.integer);
-+	      m = MATCH_YES;
-+	    }
-+	}
-+
-+	if (m == MATCH_YES)
-+	  {
-+	    if (gfc_match_char (')') == MATCH_NO)
-+	       m = MATCH_ERROR;
-+  }
-+     }
-+
-+  if (expr != NULL)
-+     gfc_free_expr (expr);
-+  return m;
-+}
- 
- /* Special subroutine for finding a symbol.  Check if the name is found
-    in the current name space.  If not, and we're compiling a function or
-@@ -2443,6 +2491,35 @@ check_function_name (char *name)
- }
- 
- 
-+static match
-+match_character_length_clause (gfc_charlen **cl, bool *cl_deferred, int elem)
-+{
-+  gfc_expr* char_len;
-+  char_len = NULL;
-+
-+  match m = match_char_length (&char_len, cl_deferred, false);
-+  if (m == MATCH_YES)
-+    {
-+      *cl = gfc_new_charlen (gfc_current_ns, NULL);
-+      (*cl)->length = char_len;
-+    }
-+  else if (m == MATCH_NO)
-+    {
-+      if (elem > 1
-+	  && (current_ts.u.cl->length == NULL
-+	      || current_ts.u.cl->length->expr_type != EXPR_CONSTANT))
-+	{
-+	  *cl = gfc_new_charlen (gfc_current_ns, NULL);
-+	  (*cl)->length = gfc_copy_expr (current_ts.u.cl->length);
-+	}
-+      else
-+      *cl = current_ts.u.cl;
-+
-+      *cl_deferred = current_ts.deferred;
-+    }
-+  return m;
-+}
-+
- /* Match a variable name with an optional initializer.  When this
-    subroutine is called, a variable is expected to be parsed next.
-    Depending on what is happening at the moment, updates either the
-@@ -2453,7 +2530,7 @@ variable_decl (int elem)
- {
-   char name[GFC_MAX_SYMBOL_LEN + 1];
-   static unsigned int fill_id = 0;
--  gfc_expr *initializer, *char_len;
-+  gfc_expr *initializer;
-   gfc_array_spec *as;
-   gfc_array_spec *cp_as; /* Extra copy for Cray Pointees.  */
-   gfc_charlen *cl;
-@@ -2462,11 +2539,15 @@ variable_decl (int elem)
-   match m;
-   bool t;
-   gfc_symbol *sym;
-+  match cl_match;
-+  match kind_match;
-+  int overridden_kind;
-   char c;
- 
-   initializer = NULL;
-   as = NULL;
-   cp_as = NULL;
-+  kind_match = MATCH_NO;
- 
-   /* When we get here, we've just matched a list of attributes and
-      maybe a type and a double colon.  The next thing we expect to see
-@@ -2519,6 +2600,28 @@ variable_decl (int elem)
- 
-   var_locus = gfc_current_locus;
- 
-+
-+  cl = NULL;
-+  cl_deferred = false;
-+  cl_match = MATCH_NO;
-+
-+  /* Check for a character length clause before an array clause */
-+  if (flag_dec_override_kind)
-+    {
-+      if (current_ts.type == BT_CHARACTER)
-+	{
-+	  cl_match = match_character_length_clause (&cl, &cl_deferred, elem);
-+	  if (cl_match == MATCH_ERROR)
-+	    goto cleanup;
-+	}
-+      else
-+	{
-+	  kind_match = match_per_symbol_kind (&overridden_kind);
-+	  if (kind_match == MATCH_ERROR)
-+	    goto cleanup;
-+	}
-+    }
-+
-   /* Now we could see the optional array spec. or character length.  */
-   m = gfc_match_array_spec (&as, true, true);
-   if (m == MATCH_ERROR)
-@@ -2667,40 +2770,12 @@ variable_decl (int elem)
- 	}
-     }
- 
--  char_len = NULL;
--  cl = NULL;
--  cl_deferred = false;
--
--  if (current_ts.type == BT_CHARACTER)
-+  /* Second chance for a character length clause */
-+  if (cl_match == MATCH_NO && current_ts.type == BT_CHARACTER)
-     {
--      switch (match_char_length (&char_len, &cl_deferred, false))
--	{
--	case MATCH_YES:
--	  cl = gfc_new_charlen (gfc_current_ns, NULL);
--
--	  cl->length = char_len;
--	  break;
--
--	/* Non-constant lengths need to be copied after the first
--	   element.  Also copy assumed lengths.  */
--	case MATCH_NO:
--	  if (elem > 1
--	      && (current_ts.u.cl->length == NULL
--		  || current_ts.u.cl->length->expr_type != EXPR_CONSTANT))
--	    {
--	      cl = gfc_new_charlen (gfc_current_ns, NULL);
--	      cl->length = gfc_copy_expr (current_ts.u.cl->length);
--	    }
--	  else
--	    cl = current_ts.u.cl;
--
--	  cl_deferred = current_ts.deferred;
--
--	  break;
--
--	case MATCH_ERROR:
--	  goto cleanup;
--	}
-+      m = match_character_length_clause (&cl, &cl_deferred, elem);
-+      if (m == MATCH_ERROR)
-+	goto cleanup;
-     }
- 
-   /* The dummy arguments and result of the abreviated form of MODULE
-@@ -2802,6 +2877,19 @@ variable_decl (int elem)
-       goto cleanup;
-     }
- 
-+  if (kind_match == MATCH_YES)
-+    {
-+      gfc_find_symbol (name, gfc_current_ns, 1, &sym);
-+      /* sym *must* be found at this point */
-+      sym->ts.kind = overridden_kind;
-+      if (gfc_validate_kind (sym->ts.type, sym->ts.kind, true) < 0)
-+	{
-+	  gfc_error ("Kind %d not supported for type %s at %C",
-+		     sym->ts.kind, gfc_basic_typename (sym->ts.type));
-+	  return MATCH_ERROR;
-+	}
-+    }
-+
-   if (!check_function_name (name))
-     {
-       m = MATCH_ERROR;
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 25cc948699b..4a269ebb22d 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -493,6 +493,10 @@ fdec-non-integer-index
- Fortran Var(flag_dec_non_integer_index)
- Enable support for non-integer substring indexes.
- 
-+fdec-override-kind
-+Fortran Var(flag_dec_override_kind)
-+Enable support for per variable kind specification.
-+
- fdec-old-init
- Fortran Var(flag_dec_old_init)
- Enable support for old style initializers in derived types.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index d6bd36c3a8a..edbab483b36 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -80,6 +80,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_duplicates, value, value);
-   SET_BITFLAG (flag_dec_non_integer_index, value, value);
-   SET_BITFLAG (flag_dec_old_init, value, value);
-+  SET_BITFLAG (flag_dec_override_kind, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
-new file mode 100644
-index 00000000000..706ea4112a4
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test character declaration with mixed string length and array specification
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       PROGRAM character_declaration
-+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/
-+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
-+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
-new file mode 100644
-index 00000000000..26d2acf01de
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec-override-kind" }
-+!
-+! Test character declaration with mixed string length and array specification
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM character_declaration
-+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/
-+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
-+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
-new file mode 100644
-index 00000000000..76e4f0bdb93
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
-@@ -0,0 +1,13 @@
-+! { dg-do compile }
-+! { dg-options "-fdec-override-kind -fno-dec-override-kind" }
-+!
-+! Test character declaration with mixed string length and array specification
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM character_declaration
-+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/ ! { dg-error "Syntax error" }
-+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
-+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1 ! { dg-error " Operands of comparison operator" }
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
-new file mode 100644
-index 00000000000..edd0f5874b7
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
-@@ -0,0 +1,31 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer*8  ai*1, bi*4, ci
-+          real*4 ar*4, br*8, cr
-+
-+          ai = 1
-+          ar = 1.0
-+          bi = 2
-+          br = 2.0
-+          ci = 3
-+          cr = 3.0
-+
-+          if (ai .ne. 1) stop 1
-+          if (abs(ar - 1.0) > 1.0D-6) stop 2
-+          if (bi .ne. 2) stop 3
-+          if (abs(br - 2.0) > 1.0D-6) stop 4
-+          if (ci .ne. 3) stop 5
-+          if (abs(cr - 3.0) > 1.0D-6) stop 6
-+          if (kind(ai) .ne. 1) stop 7
-+          if (kind(ar) .ne. 4) stop 8
-+          if (kind(bi) .ne. 4) stop 9
-+          if (kind(br) .ne. 8) stop 10
-+          if (kind(ci) .ne. 8) stop 11
-+          if (kind(cr) .ne. 4) stop 12
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
-new file mode 100644
-index 00000000000..bfaba584dbb
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
-@@ -0,0 +1,31 @@
-+! { dg-do run }
-+! { dg-options "-fdec-override-kind" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer*8  ai*1, bi*4, ci
-+          real*4 ar*4, br*8, cr
-+
-+          ai = 1
-+          ar = 1.0
-+          bi = 2
-+          br = 2.0
-+          ci = 3
-+          cr = 3.0
-+
-+          if (ai .ne. 1) stop 1
-+          if (abs(ar - 1.0) > 1.0D-6) stop 2
-+          if (bi .ne. 2) stop 3
-+          if (abs(br - 2.0) > 1.0D-6) stop 4
-+          if (ci .ne. 3) stop 5
-+          if (abs(cr - 3.0) > 1.0D-6) stop 6
-+          if (kind(ai) .ne. 1) stop 7
-+          if (kind(ar) .ne. 4) stop 8
-+          if (kind(bi) .ne. 4) stop 9
-+          if (kind(br) .ne. 8) stop 10
-+          if (kind(ci) .ne. 8) stop 11
-+          if (kind(cr) .ne. 4) stop 12
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
-new file mode 100644
-index 00000000000..5ff434e7466
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
-@@ -0,0 +1,31 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-override-kind" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer*8  ai*1, bi*4, ci ! { dg-error "Syntax error" }
-+          real*4 ar*4, br*8, cr ! { dg-error "Syntax error" }
-+
-+          ai = 1
-+          ar = 1.0
-+          bi = 2
-+          br = 2.0
-+          ci = 3
-+          cr = 3.0
-+
-+          if (ai .ne. 1) stop 1
-+          if (abs(ar - 1.0) > 1.0D-6) stop 2
-+          if (bi .ne. 2) stop 3
-+          if (abs(br - 2.0) > 1.0D-6) stop 4
-+          if (ci .ne. 3) stop 5
-+          if (abs(cr - 3.0) > 1.0D-6) stop 6
-+          if (kind(ai) .ne. 1) stop 7
-+          if (kind(ar) .ne. 4) stop 8
-+          if (kind(bi) .ne. 4) stop 9
-+          if (kind(br) .ne. 8) stop 10
-+          if (kind(ci) .ne. 8) stop 11
-+          if (kind(cr) .ne. 4) stop 12
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
-new file mode 100644
-index 00000000000..c01980e8b9d
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
-@@ -0,0 +1,14 @@
-+! { dg-do compile }
-+!
-+! Test kind specification in variable not in type. The per variable
-+! kind specification is not enabled so these should fail
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a) ! { dg-error "Syntax error" }
-+          real c*(8)    ! { dg-error "Syntax error" }
-+          logical d*1_1 ! { dg-error "Syntax error" }
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
-new file mode 100644
-index 00000000000..e2f39da3f4f
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
-@@ -0,0 +1,19 @@
-+! { dg-do run }
-+! { dg-options "-fdec-override-kind" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a)
-+          real c*(8)
-+          logical d*(1_1)
-+          character e*(a)
-+          if (kind(b).ne.2) stop 1
-+          if (kind(c).ne.8) stop 2
-+          if (kind(d).ne.1) stop 3
-+          if (len(e).ne.2) stop 4
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
-new file mode 100644
-index 00000000000..569747874e3
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
-@@ -0,0 +1,19 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a)
-+          real c*(8)
-+          logical d*(1_1)
-+          character e*(a)
-+          if (kind(b).ne.2) stop 1
-+          if (kind(c).ne.8) stop 2
-+          if (kind(d).ne.1) stop 3
-+          if (len(e).ne.2) stop 4
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
-new file mode 100644
-index 00000000000..b975bfd15c5
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
-@@ -0,0 +1,15 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-override-kind" }
-+!
-+! Test kind specification in variable not in type as the per variable
-+! kind specification is not enables these should fail
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a) ! { dg-error "Syntax error" }
-+          real c*(8)    ! { dg-error "Syntax error" }
-+          logical d*1_1 ! { dg-error "Syntax error" }
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
-new file mode 100644
-index 00000000000..85732e0bd85
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
-@@ -0,0 +1,14 @@
-+! { dg-do compile }
-+! { dg-options "-fdec" }
-+!
-+! Check that invalid kind values are rejected.
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=3)
-+          integer b*(a) ! { dg-error "Kind 3 not supported" }
-+          real c*(78)   ! { dg-error "Kind 78 not supported" }
-+          logical d*(*) ! { dg-error "Invalid character" }
-+        end
--- 
-2.27.0
-

SOURCES/gcc11-fortran-fdec-sequence.patch

@@ -1,262 +0,0 @@
-From bb76446db10c21860a4e19569ce3e350d8a2b59f Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 15:00:44 +0000
-Subject: [PATCH 09/10] Add the SEQUENCE attribute by default if it's not
- present.
-
-Use -fdec-sequence to enable this feature. Also enabled by -fdec.
----
- gcc/fortran/lang.opt                          |  4 ++
- gcc/fortran/options.c                         |  1 +
- gcc/fortran/resolve.c                         | 13 ++++-
- ...dd_SEQUENCE_to_COMMON_block_by_default_1.f | 57 +++++++++++++++++++
- ...dd_SEQUENCE_to_COMMON_block_by_default_2.f | 57 +++++++++++++++++++
- ...dd_SEQUENCE_to_COMMON_block_by_default_3.f | 57 +++++++++++++++++++
- 6 files changed, 186 insertions(+), 3 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_3.f
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 4ca2f93f2df..019c798cf09 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -509,6 +509,10 @@ fdec-promotion
- Fortran Var(flag_dec_promotion)
- Add support for type promotion in intrinsic arguments.
- 
-+fdec-sequence
-+Fortran Var(flag_dec_sequence)
-+Add the SEQUENCE attribute by default if it's not present.
-+
- fdec-structure
- Fortran Var(flag_dec_structure)
- Enable support for DEC STRUCTURE/RECORD.
-diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
-index 15079c7e95a..050f56fdc25 100644
---- a/gcc/fortran/options.c
-+++ b/gcc/fortran/options.c
-@@ -83,6 +83,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_override_kind, value, value);
-   SET_BITFLAG (flag_dec_non_logical_if, value, value);
-   SET_BITFLAG (flag_dec_promotion, value, value);
-+  SET_BITFLAG (flag_dec_sequence, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
-index 07dd039f3bf..fe7d0cc5944 100644
---- a/gcc/fortran/resolve.c
-+++ b/gcc/fortran/resolve.c
-@@ -978,9 +978,16 @@ resolve_common_vars (gfc_common_head *common_block, bool named_common)
- 
-       if (!(csym->ts.u.derived->attr.sequence
- 	    || csym->ts.u.derived->attr.is_bind_c))
--	gfc_error_now ("Derived type variable %qs in COMMON at %L "
--		       "has neither the SEQUENCE nor the BIND(C) "
--		       "attribute", csym->name, &csym->declared_at);
-+	{
-+	  if (flag_dec_sequence)
-+	    /* Assume sequence. */
-+	    csym->ts.u.derived->attr.sequence = 1;
-+	  else
-+	    gfc_error_now ("Derived type variable '%s' in COMMON at %L "
-+			   "has neither the SEQUENCE nor the BIND(C) "
-+			   "attribute", csym->name, &csym->declared_at);
-+	}
-+
-       if (csym->ts.u.derived->attr.alloc_comp)
- 	gfc_error_now ("Derived type variable %qs in COMMON at %L "
- 		       "has an ultimate component that is "
-diff --git a/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_1.f b/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_1.f
-new file mode 100644
-index 00000000000..fe7b39625eb
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_1.f
-@@ -0,0 +1,57 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test add default SEQUENCE attribute derived types appearing in
-+! COMMON blocks and EQUIVALENCE statements.
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        MODULE SEQ
-+          TYPE STRUCT1
-+            INTEGER*4     ID
-+            INTEGER*4     TYPE
-+            INTEGER*8     DEFVAL
-+            CHARACTER*(4) NAME
-+            LOGICAL*1     NIL
-+          END TYPE STRUCT1
-+        END MODULE
-+
-+        SUBROUTINE A
-+          USE SEQ
-+          TYPE (STRUCT1) S
-+          COMMON /BLOCK1/ S
-+          IF (S%ID.NE.5) STOP 1
-+          IF (S%TYPE.NE.1000) STOP 2
-+          IF (S%DEFVAL.NE.-99) STOP 3
-+          IF (S%NAME.NE."JANE") STOP 4
-+          IF (S%NIL.NEQV..FALSE.) STOP 5
-+        END SUBROUTINE
-+
-+        PROGRAM sequence_att_common
-+          USE SEQ
-+          IMPLICIT NONE
-+          TYPE (STRUCT1) S1
-+          TYPE (STRUCT1) S2
-+          TYPE (STRUCT1) S3
-+
-+          EQUIVALENCE (S1,S2)
-+          COMMON /BLOCK1/ S3
-+
-+          S1%ID = 5
-+          S1%TYPE = 1000
-+          S1%DEFVAL = -99
-+          S1%NAME = "JANE"
-+          S1%NIL = .FALSE.
-+
-+          IF (S2%ID.NE.5) STOP 1
-+          IF (S2%TYPE.NE.1000) STOP 2
-+          IF (S2%DEFVAL.NE.-99) STOP 3
-+          IF (S2%NAME.NE."JANE") STOP 4
-+          IF (S2%NIL.NEQV..FALSE.) STOP 5
-+
-+          S3 = S1
-+
-+          CALL A
-+          
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_2.f b/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_2.f
-new file mode 100644
-index 00000000000..83512f0f3a2
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_2.f
-@@ -0,0 +1,57 @@
-+! { dg-do run }
-+! { dg-options "-fdec-sequence" }
-+!
-+! Test add default SEQUENCE attribute derived types appearing in
-+! COMMON blocks and EQUIVALENCE statements.
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        MODULE SEQ
-+          TYPE STRUCT1
-+            INTEGER*4     ID
-+            INTEGER*4     TYPE
-+            INTEGER*8     DEFVAL
-+            CHARACTER*(4) NAME
-+            LOGICAL*1     NIL
-+          END TYPE STRUCT1
-+        END MODULE
-+
-+        SUBROUTINE A
-+          USE SEQ
-+          TYPE (STRUCT1) S
-+          COMMON /BLOCK1/ S
-+          IF (S%ID.NE.5) STOP 1
-+          IF (S%TYPE.NE.1000) STOP 2
-+          IF (S%DEFVAL.NE.-99) STOP 3
-+          IF (S%NAME.NE."JANE") STOP 4
-+          IF (S%NIL.NEQV..FALSE.) STOP 5
-+        END SUBROUTINE
-+
-+        PROGRAM sequence_att_common
-+          USE SEQ
-+          IMPLICIT NONE
-+          TYPE (STRUCT1) S1
-+          TYPE (STRUCT1) S2
-+          TYPE (STRUCT1) S3
-+
-+          EQUIVALENCE (S1,S2)
-+          COMMON /BLOCK1/ S3
-+
-+          S1%ID = 5
-+          S1%TYPE = 1000
-+          S1%DEFVAL = -99
-+          S1%NAME = "JANE"
-+          S1%NIL = .FALSE.
-+
-+          IF (S2%ID.NE.5) STOP 1
-+          IF (S2%TYPE.NE.1000) STOP 2
-+          IF (S2%DEFVAL.NE.-99) STOP 3
-+          IF (S2%NAME.NE."JANE") STOP 4
-+          IF (S2%NIL.NEQV..FALSE.) STOP 5
-+
-+          S3 = S1
-+
-+          CALL A
-+          
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_3.f b/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_3.f
-new file mode 100644
-index 00000000000..26cd59f9090
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_add_SEQUENCE_to_COMMON_block_by_default_3.f
-@@ -0,0 +1,57 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-sequence" }
-+!
-+! Test add default SEQUENCE attribute derived types appearing in
-+! COMMON blocks and EQUIVALENCE statements.
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        MODULE SEQ
-+          TYPE STRUCT1
-+            INTEGER*4     ID
-+            INTEGER*4     TYPE
-+            INTEGER*8     DEFVAL
-+            CHARACTER*(4) NAME
-+            LOGICAL*1     NIL
-+          END TYPE STRUCT1
-+        END MODULE
-+
-+        SUBROUTINE A
-+          USE SEQ
-+          TYPE (STRUCT1) S ! { dg-error "Derived type variable" }
-+          COMMON /BLOCK1/ S
-+          IF (S%ID.NE.5) STOP 1
-+          IF (S%TYPE.NE.1000) STOP 2
-+          IF (S%DEFVAL.NE.-99) STOP 3
-+          IF (S%NAME.NE."JANE") STOP 4
-+          IF (S%NIL.NEQV..FALSE.) STOP 5
-+        END SUBROUTINE
-+
-+        PROGRAM sequence_att_common
-+          USE SEQ
-+          IMPLICIT NONE
-+          TYPE (STRUCT1) S1
-+          TYPE (STRUCT1) S2
-+          TYPE (STRUCT1) S3 ! { dg-error "Derived type variable" }
-+
-+          EQUIVALENCE (S1,S2) ! { dg-error "Derived type variable" }
-+          COMMON /BLOCK1/ S3
-+
-+          S1%ID = 5
-+          S1%TYPE = 1000
-+          S1%DEFVAL = -99
-+          S1%NAME = "JANE"
-+          S1%NIL = .FALSE.
-+
-+          IF (S2%ID.NE.5) STOP 1
-+          IF (S2%TYPE.NE.1000) STOP 2
-+          IF (S2%DEFVAL.NE.-99) STOP 3
-+          IF (S2%NAME.NE."JANE") STOP 4
-+          IF (S2%NIL.NEQV..FALSE.) STOP 5
-+
-+          S3 = S1
-+
-+          CALL A
-+          
-+        END
--- 
-2.27.0
-

SOURCES/gcc11-fortran-flogical-as-integer.patch

@@ -1,305 +0,0 @@
-From 9b45f3063dfd2b893e7963a4828c1b0afecdc68a Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 12:41:46 +0000
-Subject: [PATCH 02/10] Convert LOGICAL to INTEGER for arithmetic ops, and vice
- versa
-
-We allow converting LOGICAL types to INTEGER when doing arithmetic
-operations, and converting INTEGER types to LOGICAL for use in
-boolean operations.
-
-This feature is enabled with the -flogical-as-integer flag.
-
-Note: using this feature will disable bitwise logical operations enabled by
--fdec.
----
- gcc/fortran/lang.opt                          |  4 ++
- gcc/fortran/resolve.c                         | 55 ++++++++++++++++++-
- .../logical_to_integer_and_vice_versa_1.f     | 31 +++++++++++
- .../logical_to_integer_and_vice_versa_2.f     | 31 +++++++++++
- .../logical_to_integer_and_vice_versa_3.f     | 33 +++++++++++
- .../logical_to_integer_and_vice_versa_4.f     | 33 +++++++++++
- 6 files changed, 186 insertions(+), 1 deletion(-)
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 52bd522051e..c4da248f07c 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -497,6 +497,10 @@ fdec-static
- Fortran Var(flag_dec_static)
- Enable DEC-style STATIC and AUTOMATIC attributes.
- 
-+flogical-as-integer
-+Fortran Var(flag_logical_as_integer)
-+Convert from integer to logical or logical to integer for arithmetic operations.
-+
- fdefault-double-8
- Fortran Var(flag_default_double)
- Set the default double precision kind to an 8 byte wide type.
-diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
-index c075d0fa0c4..4b90cb59902 100644
---- a/gcc/fortran/resolve.c
-+++ b/gcc/fortran/resolve.c
-@@ -3915,7 +3915,6 @@ lookup_uop_fuzzy (const char *op, gfc_symtree *uop)
-   return gfc_closest_fuzzy_match (op, candidates);
- }
- 
--
- /* Callback finding an impure function as an operand to an .and. or
-    .or.  expression.  Remember the last function warned about to
-    avoid double warnings when recursing.  */
-@@ -3975,6 +3974,22 @@ convert_hollerith_to_character (gfc_expr *e)
-     }
- }
- 
-+/* If E is a logical, convert it to an integer and issue a warning
-+   for the conversion.  */
-+
-+static void
-+convert_integer_to_logical (gfc_expr *e)
-+{
-+  if (e->ts.type == BT_INTEGER)
-+    {
-+      /* Convert to LOGICAL */
-+      gfc_typespec t;
-+      t.type = BT_LOGICAL;
-+      t.kind = 1;
-+      gfc_convert_type_warn (e, &t, 2, 1);
-+    }
-+}
-+
- /* Convert to numeric and issue a warning for the conversion.  */
- 
- static void
-@@ -3987,6 +4002,22 @@ convert_to_numeric (gfc_expr *a, gfc_expr *b)
-   gfc_convert_type_warn (a, &t, 2, 1);
- }
- 
-+/* If E is a logical, convert it to an integer and issue a warning
-+   for the conversion.  */
-+
-+static void
-+convert_logical_to_integer (gfc_expr *e)
-+{
-+  if (e->ts.type == BT_LOGICAL)
-+    {
-+      /* Convert to INTEGER */
-+      gfc_typespec t;
-+      t.type = BT_INTEGER;
-+      t.kind = 1;
-+      gfc_convert_type_warn (e, &t, 2, 1);
-+    }
-+}
-+
- /* Resolve an operator expression node.  This can involve replacing the
-    operation with a user defined function call.  */
- 
-@@ -4072,6 +4103,12 @@ resolve_operator (gfc_expr *e)
-     case INTRINSIC_TIMES:
-     case INTRINSIC_DIVIDE:
-     case INTRINSIC_POWER:
-+      if (flag_logical_as_integer)
-+	{
-+	  convert_logical_to_integer (op1);
-+	  convert_logical_to_integer (op2);
-+	}
-+
-       if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
- 	{
- 	  gfc_type_convert_binary (e, 1);
-@@ -4108,6 +4145,13 @@ resolve_operator (gfc_expr *e)
-     case INTRINSIC_OR:
-     case INTRINSIC_EQV:
-     case INTRINSIC_NEQV:
-+
-+      if (flag_logical_as_integer)
-+	{
-+	  convert_integer_to_logical (op1);
-+	  convert_integer_to_logical (op2);
-+	}
-+
-       if (op1->ts.type == BT_LOGICAL && op2->ts.type == BT_LOGICAL)
- 	{
- 	  e->ts.type = BT_LOGICAL;
-@@ -4158,6 +4202,9 @@ resolve_operator (gfc_expr *e)
- 	  goto simplify_op;
- 	}
- 
-+      if (flag_logical_as_integer)
-+	convert_integer_to_logical (op1);
-+
-       if (op1->ts.type == BT_LOGICAL)
- 	{
- 	  e->ts.type = BT_LOGICAL;
-@@ -4198,6 +4245,12 @@ resolve_operator (gfc_expr *e)
- 	  convert_hollerith_to_character (op2);
- 	}
- 
-+      if (flag_logical_as_integer)
-+	{
-+	  convert_logical_to_integer (op1);
-+	  convert_logical_to_integer (op2);
-+	}
-+
-       if (op1->ts.type == BT_CHARACTER && op2->ts.type == BT_CHARACTER
- 	  && op1->ts.kind == op2->ts.kind)
- 	{
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
-new file mode 100644
-index 00000000000..938a91d9e9a
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
-@@ -0,0 +1,31 @@
-+! { dg-do run }
-+! { dg-options "-std=legacy -flogical-as-integer" }
-+!
-+! Test conversion between logical and integer for logical operators
-+!
-+! Test case contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified for -flogical-as-integer by Mark Eggleston
-+! <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_integer_conversion
-+          LOGICAL lpos /.true./
-+          INTEGER ineg/0/
-+          INTEGER ires
-+          LOGICAL lres
-+
-+          ! Test Logicals converted to Integers
-+          if ((lpos.AND.ineg).EQ.1) STOP 3
-+          if ((ineg.AND.lpos).NE.0) STOP 4
-+          ires = (.true..AND.0)
-+          if (ires.NE.0) STOP 5
-+          ires = (1.AND..false.)
-+          if (ires.EQ.1) STOP 6
-+
-+          ! Test Integers converted to Logicals
-+          if (lpos.EQ.ineg) STOP 7
-+          if (ineg.EQ.lpos) STOP 8
-+          lres = (.true..EQ.0)
-+          if (lres) STOP 9
-+          lres = (1.EQ..false.)
-+          if (lres) STOP 10
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
-new file mode 100644
-index 00000000000..9f146202ba5
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
-@@ -0,0 +1,31 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" }
-+!
-+! Based on logical_to_integer_and_vice_versa_1.f but with option disabled
-+! to test for error messages.
-+!
-+! Test case contributed by by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+!
-+        PROGRAM logical_integer_conversion
-+          LOGICAL lpos /.true./
-+          INTEGER ineg/0/
-+          INTEGER ires
-+          LOGICAL lres
-+
-+          ! Test Logicals converted to Integers
-+          if ((lpos.AND.ineg).EQ.1) STOP 3 ! { dg-error "Operands of logical operator" }
-+          if ((ineg.AND.lpos).NE.0) STOP 4 ! { dg-error "Operands of logical operator" }
-+          ires = (.true..AND.0) ! { dg-error "Operands of logical operator" }
-+          if (ires.NE.0) STOP 5
-+          ires = (1.AND..false.) ! { dg-error "Operands of logical operator" }
-+          if (ires.EQ.1) STOP 6
-+
-+          ! Test Integers converted to Logicals
-+          if (lpos.EQ.ineg) STOP 7 ! { dg-error "Operands of comparison operator" }
-+          if (ineg.EQ.lpos) STOP 8 ! { dg-error "Operands of comparison operator" }
-+          lres = (.true..EQ.0) ! { dg-error "Operands of comparison operator" }
-+          if (lres) STOP 9
-+          lres = (1.EQ..false.) ! { dg-error "Operands of comparison operator" }
-+          if (lres) STOP 10
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
-new file mode 100644
-index 00000000000..446873eb2dc
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -flogical-as-integer" }
-+!
-+! Test conversion between logical and integer for logical operators
-+!
-+        program test
-+          logical f /.false./
-+          logical t /.true./
-+          real x
-+
-+          x = 7.7
-+          x = x + t*3.0
-+          if (abs(x - 10.7).gt.0.00001) stop 1
-+          x = x + .false.*5.0
-+          if (abs(x - 10.7).gt.0.00001) stop 2
-+          x = x - .true.*5.0
-+          if (abs(x - 5.7).gt.0.00001) stop 3
-+          x = x + t
-+          if (abs(x - 6.7).gt.0.00001) stop 4
-+          x = x + f
-+          if (abs(x - 6.7).gt.0.00001) stop 5
-+          x = x - t
-+          if (abs(x - 5.7).gt.0.00001) stop 6
-+          x = x - f
-+          if (abs(x - 5.7).gt.0.00001) stop 7
-+          x = x**.true.
-+          if (abs(x - 5.7).gt.0.00001) stop 8
-+          x = x**.false.
-+          if (abs(x - 1.0).gt.0.00001) stop 9
-+          x = x/t
-+          if (abs(x - 1.0).gt.0.00001) stop 10
-+          if ((x/.false.).le.huge(x)) stop 11
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
-new file mode 100644
-index 00000000000..4301a4988d8
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" }
-+!
-+! Test conversion between logical and integer for logical operators
-+!
-+        program test
-+          logical f /.false./
-+          logical t /.true./
-+          real x
-+
-+          x = 7.7
-+          x = x + t*3.0 ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 10.7).gt.0.00001) stop 1
-+          x = x + .false.*5.0 ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 10.7).gt.0.00001) stop 2
-+          x = x - .true.*5.0 ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 3
-+          x = x + t ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 6.7).gt.0.00001) stop 4
-+          x = x + f ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 6.7).gt.0.00001) stop 5
-+          x = x - t ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 6
-+          x = x - f ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 7
-+          x = x**.true. ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 8
-+          x = x**.false. ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 1.0).gt.0.00001) stop 9
-+          x = x/t ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 1.0).gt.0.00001) stop 10
-+          if ((x/.false.).le.huge(x)) stop 11 ! { dg-error "Operands of binary numeric" }
-+        end
--- 
-2.27.0
-

SOURCES/gcc11-isl-dl2.patch

@@ -1,71 +0,0 @@
-2011-04-04  Jakub Jelinek  <jakub@redhat.com>
-
-	* toplev.c (toplev_main_argv): New variable.
-	(toplev_main): Initialize it.
-	* graphite.c (init_isl_pointers): Load libisl.so.15 from gcc's private
-	directory.
-
---- gcc/toplev.c.jj	2008-12-09 23:59:10.000000000 +0100
-+++ gcc/toplev.c	2009-01-27 14:33:52.000000000 +0100
-@@ -117,6 +117,8 @@ static void compile_file (void);
- /* True if we don't need a backend (e.g. preprocessing only).  */
- static bool no_backend;
- 
-+const char **toplev_main_argv;
-+
- /* Decoded options, and number of such options.  */
- struct cl_decoded_option *save_decoded_options;
- unsigned int save_decoded_options_count;
-@@ -2287,6 +2289,8 @@ toplev::main (int argc, char **argv)
- 
-   expandargv (&argc, &argv);
- 
-+  toplev_main_argv = CONST_CAST2 (const char **, char **, argv);
-+
-   /* Initialization of GCC's environment, and diagnostics.  */
-   general_init (argv[0], m_init_signals);
- 
---- gcc/graphite.c.jj	2010-12-01 10:24:32.000000000 -0500
-+++ gcc/graphite.c	2010-12-01 11:46:07.832118193 -0500
-@@ -64,11 +64,39 @@ __typeof (isl_pointers__) isl_pointers__
- static bool
- init_isl_pointers (void)
- {
--  void *h;
-+  void *h = NULL;
-+  extern const char **toplev_main_argv;
-+  char *buf, *p;
-+  size_t len;
- 
-   if (isl_pointers__.inited)
-     return isl_pointers__.h != NULL;
--  h = dlopen ("libisl.so.15", RTLD_LAZY);
-+  len = progname - toplev_main_argv[0];
-+  buf = XALLOCAVAR (char, len + sizeof "libisl.so.15");
-+  memcpy (buf, toplev_main_argv[0], len);
-+  strcpy (buf + len, "libisl.so.15");
-+  len += sizeof "libisl.so.15";
-+  p = strstr (buf, "/libexec/");
-+  if (p != NULL)
-+    {
-+      while (1)
-+	{
-+	  char *q = strstr (p + 8, "/libexec/");
-+	  if (q == NULL)
-+	    break;
-+	  p = q;
-+	}
-+      memmove (p + 4, p + 8, len - (p + 8 - buf));
-+      h = dlopen (buf, RTLD_LAZY);
-+      if (h == NULL)
-+	{
-+	  len = progname - toplev_main_argv[0];
-+	  memcpy (buf, toplev_main_argv[0], len);
-+	  strcpy (buf + len, "libisl.so.15");
-+	}
-+    }
-+  if (h == NULL)
-+    h = dlopen (buf, RTLD_LAZY);
-   isl_pointers__.h = h;
-   if (h == NULL)
-     return false;

SOURCES/gcc11-libgcc-link.patch

@@ -1,45 +0,0 @@
-libgcc: Honor LDFLAGS_FOR_TARGET when linking libgcc_s
-
-When building gcc with some specific LDFLAGS_FOR_TARGET, e.g.
-LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
-those flags propagate info linking of target shared libraries,
-e.g. lib{ubsan,tsan,stdc++,quadmath,objc,lsan,itm,gphobos,gdruntime,gomp,go,gfortran,atomic,asan}.so.*
-but there is one important exception, libgcc_s.so.* linking ignores it.
-
-The following patch fixes that.
-
-Bootstrapped/regtested on x86_64-linux with LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
-and verified that libgcc_s.so.* is BIND_NOW when it previously wasn't, and
-without any LDFLAGS_FOR_TARGET on x86_64-linux and i686-linux.
-There on x86_64-linux I've verified that the libgcc_s.so.1 linking command
-line for -m64 is identical except for whitespace to one without the patch,
-and for -m32 multilib $(LDFLAGS) actually do supply there an extra -m32
-that also repeats later in the @multilib_flags@, which should be harmless.
-
-2021-08-04  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/t-slibgcc (SHLIB_LINK): Add $(LDFLAGS).
-	* config/t-slibgcc-vms (SHLIB_LINK): Likewise.
-
---- libgcc/config/t-slibgcc
-+++ libgcc/config/t-slibgcc
-@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- 	$(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
- 
- SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
--	$(SHLIB_LDFLAGS) \
-+	$(SHLIB_LDFLAGS) $(LDFLAGS) \
- 	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \
- 	$(SHLIB_OBJS) $(SHLIB_LC) && \
- 	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
---- libgcc/config/t-slibgcc-vms
-+++ libgcc/config/t-slibgcc-vms
-@@ -22,7 +22,7 @@ SHLIB_LINK = \
-   objdump --syms $(SHLIB_OBJS) | \
-   $(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt ; \
-   echo "case_sensitive=NO" >> SYMVEC_$$$$.opt; \
--  $(CC) $(LIBGCC2_CFLAGS) -nodefaultlibs \
-+  $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -nodefaultlibs \
-   -shared --for-linker=/noinform -o $(SHLIB_NAME) $(SHLIB_OBJS) \
-   --for-linker=SYMVEC_$$$$.opt \
-   --for-linker=gsmatch=equal,$(shlib_version)

SOURCES/gcc11-libgfortran-flush.patch

@@ -1,51 +0,0 @@
-commit c14f38d4292ec22462a4080841d526f87428130a
-Author: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
-Date:   Thu Dec 16 15:33:17 2021 +0100
-
-    Fix FLUSH IOSTAT value
-    
-    PR libfortran/101255
-    
-    libgfortran/ChangeLog:
-    
-            * io/file_pos.c: Fix error code.
-    
-    gcc/testsuite/ChangeLog:
-    
-            * gfortran.dg/iostat_5.f90: New file.
-
-diff --git a/gcc/testsuite/gfortran.dg/iostat_5.f90 b/gcc/testsuite/gfortran.dg/iostat_5.f90
-new file mode 100644
-index 00000000000..1e72dfdf7e1
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/iostat_5.f90
-@@ -0,0 +1,16 @@
-+! PR libfortran/101255
-+! { dg-do run }
-+
-+program test
-+  use ISO_FORTRAN_ENV, only: IOSTAT_EOR, IOSTAT_END
-+  implicit none
-+  character(len=50) :: err
-+  integer :: i
-+
-+  err = ""
-+  flush(99, iostat=i, iomsg=err)
-+
-+  if (err == "") stop 1
-+  if (i >= 0) stop 2
-+  if (i == IOSTAT_EOR .or. i == IOSTAT_END) stop 3
-+end
-diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
-index 7e71ca577e0..4ed1698f17a 100644
---- a/libgfortran/io/file_pos.c
-+++ b/libgfortran/io/file_pos.c
-@@ -527,7 +527,7 @@ st_flush (st_parameter_filepos *fpp)
-     }
-   else
-     /* FLUSH on unconnected unit is illegal: F95 std., 9.3.5. */ 
--    generate_error (&fpp->common, LIBERROR_BAD_OPTION,
-+    generate_error (&fpp->common, -LIBERROR_BAD_UNIT,
- 			"Specified UNIT in FLUSH is not connected");
- 
-   if (needs_unlock)

SOURCES/gcc11-pie.patch

@@ -1,850 +0,0 @@
-From 088d8e322811394203220663c3b9c925980d57a2 Mon Sep 17 00:00:00 2001
-From: Marek Polacek <polacek@redhat.com>
-Date: Tue, 1 Feb 2022 18:27:16 -0500
-Subject: [PATCH] configure: Implement --enable-host-pie
-
-This patch implements the --enable-host-pie configure option which
-makes the compiler executables PIE.  This can be used to enhance
-protection against ROP attacks, and can be viewed as part of a wider
-trend to harden binaries.
-
-It is similar to the option --enable-host-shared, except that --e-h-s
-won't add -shared to the linker flags whereas --e-h-p will add -pie.
-It is different from --enable-default-pie because that option just
-adds an implicit -fPIE/-pie when the compiler is invoked, but the
-compiler itself isn't PIE.
-
-Since r12-5768-gfe7c3ecf, PCH works well with PIE, so there are no PCH
-regressions.
-
-I plan to add an option to link with -Wl,-z,now.
-
-c++tools/ChangeLog:
-
-	* Makefile.in: Rename PIEFLAG to PICFLAG.  Set LD_PICFLAG.  Use it.
-	Use pic/libiberty.a if PICFLAG is set.
-	* configure.ac (--enable-default-pie): Set PICFLAG instead of PIEFLAG.
-	(--enable-host-pie): New check.
-	* configure: Regenerate.
-
-gcc/ChangeLog:
-
-	* Makefile.in: Set LD_PICFLAG.  Use it.  Set enable_host_pie.
-	Remove NO_PIE_CFLAGS and NO_PIE_FLAG.  Pass LD_PICFLAG to
-	ALL_LINKERFLAGS.  Use the "pic" build of libiberty if --enable-host-pie.
-	* configure.ac (--enable-host-shared): Don't set PICFLAG here.
-	(--enable-host-pie): New check.  Set PICFLAG and LD_PICFLAG after this
-	check.
-	* configure: Regenerate.
-	* doc/install.texi: Document --enable-host-pie.
-
-libcody/ChangeLog:
-
-	* Makefile.in: Pass LD_PICFLAG to LDFLAGS.
-	* configure.ac (--enable-host-shared): Don't set PICFLAG here.
-	(--enable-host-pie): New check.  Set PICFLAG and LD_PICFLAG after this
-	check.
-	* configure: Regenerate.
-
-libcpp/ChangeLog:
-
-	* configure.ac (--enable-host-shared): Don't set PICFLAG here.
-	(--enable-host-pie): New check.  Set PICFLAG after this check.
-	* configure: Regenerate.
-
-libdecnumber/ChangeLog:
-
-	* configure.ac (--enable-host-shared): Don't set PICFLAG here.
-	(--enable-host-pie): New check.  Set PICFLAG after this check.
-	* configure: Regenerate.
-
-zlib/ChangeLog:
-
-	* configure.ac (--enable-host-shared): Don't set PICFLAG here.
-	(--enable-host-pie): New check.  Set PICFLAG after this check.
-	* configure: Regenerate.
----
- c++tools/Makefile.in      | 11 ++++++---
- c++tools/configure        | 17 +++++++++++---
- c++tools/configure.ac     | 11 +++++++--
- gcc/Makefile.in           | 29 ++++++++++++++----------
- gcc/configure             | 47 +++++++++++++++++++++++++++------------
- gcc/configure.ac          | 36 +++++++++++++++++++++---------
- gcc/d/Make-lang.in        |  2 +-
- gcc/doc/install.texi      | 16 +++++++++++--
- libcody/Makefile.in       |  2 +-
- libcody/configure         | 30 ++++++++++++++++++++++++-
- libcody/configure.ac      | 26 ++++++++++++++++++++--
- libcpp/configure          | 22 +++++++++++++++++-
- libcpp/configure.ac       | 19 ++++++++++++++--
- libdecnumber/configure    | 22 +++++++++++++++++-
- libdecnumber/configure.ac | 19 ++++++++++++++--
- zlib/configure            | 30 ++++++++++++++++++++-----
- zlib/configure.ac         | 21 ++++++++++++++---
- 17 files changed, 295 insertions(+), 65 deletions(-)
-
-diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in
-index d6a33613732..4d5a5b0522b 100644
---- a/c++tools/Makefile.in
-+++ b/c++tools/Makefile.in
-@@ -28,8 +28,9 @@ AUTOCONF := @AUTOCONF@
- AUTOHEADER := @AUTOHEADER@
- CXX := @CXX@
- CXXFLAGS := @CXXFLAGS@
--PIEFLAG := @PIEFLAG@
--CXXOPTS := $(CXXFLAGS) $(PIEFLAG) -fno-exceptions -fno-rtti
-+PICFLAG := @PICFLAG@
-+LD_PICFLAG := @LD_PICFLAG@
-+CXXOPTS := $(CXXFLAGS) $(PICFLAG) -fno-exceptions -fno-rtti
- LDFLAGS := @LDFLAGS@
- exeext := @EXEEXT@
- LIBIBERTY := ../libiberty/libiberty.a
-@@ -87,11 +88,15 @@ ifeq (@CXX_AUX_TOOLS@,yes)
- 
- all::g++-mapper-server$(exeext)
- 
-+ifneq ($(PICFLAG),)
-+override LIBIBERTY := ../libiberty/pic/libiberty.a
-+endif
-+
- MAPPER.O := server.o resolver.o
- CODYLIB = ../libcody/libcody.a
- CXXINC += -I$(srcdir)/../libcody -I$(srcdir)/../include -I$(srcdir)/../gcc -I.
- g++-mapper-server$(exeext): $(MAPPER.O) $(CODYLIB)
--	+$(CXX) $(LDFLAGS) $(PIEFLAG) -o $@ $^ $(VERSION.O) $(LIBIBERTY) $(NETLIBS)
-+	+$(CXX) $(LDFLAGS) $(PICFLAG) $(LD_PICFLAG) -o $@ $^ $(VERSION.O) $(LIBIBERTY) $(NETLIBS)
- 
- # copy to gcc dir so tests there can run
- all::../gcc/g++-mapper-server$(exeext)
-diff --git a/c++tools/configure b/c++tools/configure
-index 742816e4253..88087009383 100755
---- a/c++tools/configure
-+++ b/c++tools/configure
-@@ -630,7 +630,8 @@ CPP
- EGREP
- GREP
- CXXCPP
--PIEFLAG
-+LD_PICFLAG
-+PICFLAG
- MAINTAINER
- CXX_AUX_TOOLS
- AUTOHEADER
-@@ -700,6 +701,7 @@ enable_c___tools
- enable_maintainer_mode
- enable_checking
- enable_default_pie
-+enable_host_pie
- with_gcc_major_version_only
- '
-       ac_precious_vars='build_alias
-@@ -1333,6 +1335,7 @@ Optional Features:
-                           only specific categories of checks. Categories are:
-                           yes,no,all,none,release.
-   --enable-default-pie    enable Position Independent Executable as default
-+  --enable-host-pie       build host code as PIE
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2990,12 +2993,20 @@ fi
- # Check whether --enable-default-pie was given.
- # Check whether --enable-default-pie was given.
- if test "${enable_default_pie+set}" = set; then :
--  enableval=$enable_default_pie; PIEFLAG=-fPIE
-+  enableval=$enable_default_pie; PICFLAG=-fPIE
- else
--  PIEFLAG=
-+  PICFLAG=
- fi
- 
- 
-+# Enable --enable-host-pie
-+# Check whether --enable-host-pie was given.
-+if test "${enable_host_pie+set}" = set; then :
-+  enableval=$enable_host_pie; PICFLAG=-fPIE; LD_PICFLAG=-pie
-+fi
-+
-+
-+
- 
- # Check if O_CLOEXEC is defined by fcntl
- 
-diff --git a/c++tools/configure.ac b/c++tools/configure.ac
-index 6662b5ad7c9..1e42689f2eb 100644
---- a/c++tools/configure.ac
-+++ b/c++tools/configure.ac
-@@ -102,8 +102,15 @@ fi
- AC_ARG_ENABLE(default-pie,
- [AS_HELP_STRING([--enable-default-pie],
- 		  [enable Position Independent Executable as default])],
--[PIEFLAG=-fPIE], [PIEFLAG=])
--AC_SUBST([PIEFLAG])
-+[PICFLAG=-fPIE], [PICFLAG=])
-+
-+# Enable --enable-host-pie
-+AC_ARG_ENABLE(host-pie,
-+[AS_HELP_STRING([--enable-host-pie],
-+		[build host code as PIE])],
-+[PICFLAG=-fPIE; LD_PICFLAG=-pie], [])
-+AC_SUBST(PICFLAG)
-+AC_SUBST(LD_PICFLAG)
- 
- # Check if O_CLOEXEC is defined by fcntl
- AC_CACHE_CHECK(for O_CLOEXEC, ac_cv_o_cloexec, [
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 31ff95500c9..151dbfa54ec 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -155,6 +155,9 @@ LDFLAGS = @LDFLAGS@
- # Should we build position-independent host code?
- PICFLAG = @PICFLAG@
- 
-+# The linker flag for the above.
-+LD_PICFLAG = @LD_PICFLAG@
-+
- # Flags to determine code coverage. When coverage is disabled, this will
- # contain the optimization flags, as you normally want code coverage
- # without optimization.
-@@ -263,18 +266,17 @@ LINKER = $(CC)
- LINKER_FLAGS = $(CFLAGS)
- endif
- 
-+enable_host_pie = @enable_host_pie@
-+
- # Enable Intel CET on Intel CET enabled host if needed.
- CET_HOST_FLAGS = @CET_HOST_FLAGS@
- COMPILER += $(CET_HOST_FLAGS)
- 
--NO_PIE_CFLAGS = @NO_PIE_CFLAGS@
--NO_PIE_FLAG = @NO_PIE_FLAG@
--
--# We don't want to compile the compilers with -fPIE, it make PCH fail.
--COMPILER += $(NO_PIE_CFLAGS)
-+# Maybe compile the compilers with -fPIE or -fPIC.
-+COMPILER += $(PICFLAG)
- 
--# Link with -no-pie since we compile the compiler with -fno-PIE.
--LINKER += $(NO_PIE_FLAG)
-+# Link with -pie, or -no-pie, depending on the above.
-+LINKER += $(LD_PICFLAG)
- 
- # Like LINKER, but use a mutex for serializing front end links.
- ifeq (@DO_LINK_MUTEX@,true)
-@@ -1057,18 +1059,21 @@ ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS)
- ALL_COMPILERFLAGS = $(ALL_CXXFLAGS)
- 
- # This is the variable to use when using $(LINKER).
--ALL_LINKERFLAGS = $(ALL_CXXFLAGS)
-+ALL_LINKERFLAGS = $(ALL_CXXFLAGS) $(LD_PICFLAG)
- 
- # Build and host support libraries.
- 
--# Use the "pic" build of libiberty if --enable-host-shared, unless we are
--# building for mingw.
-+# Use the "pic" build of libiberty if --enable-host-shared or --enable-host-pie,
-+# unless we are building for mingw.
- LIBIBERTY_PICDIR=$(if $(findstring mingw,$(target)),,pic)
--ifeq ($(enable_host_shared),yes)
-+ifneq ($(enable_host_shared)$(enable_host_pie),)
- LIBIBERTY = ../libiberty/$(LIBIBERTY_PICDIR)/libiberty.a
--BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/$(LIBIBERTY_PICDIR)/libiberty.a
- else
- LIBIBERTY = ../libiberty/libiberty.a
-+endif
-+ifeq ($(enable_host_shared),yes)
-+BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/$(LIBIBERTY_PICDIR)/libiberty.a
-+else
- BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a
- endif
- 
-diff --git a/gcc/configure b/gcc/configure
-index 258b17a226e..bd4fe1fd6ca 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -632,10 +632,10 @@ ac_includes_default="\
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- CET_HOST_FLAGS
--NO_PIE_FLAG
--NO_PIE_CFLAGS
--enable_default_pie
-+LD_PICFLAG
- PICFLAG
-+enable_default_pie
-+enable_host_pie
- enable_host_shared
- enable_plugin
- pluginlibs
-@@ -1025,6 +1025,7 @@ enable_link_serialization
- enable_version_specific_runtime_libs
- enable_plugin
- enable_host_shared
-+enable_host_pie
- enable_libquadmath_support
- with_linker_hash_style
- with_diagnostics_color
-@@ -1787,6 +1788,7 @@ Optional Features:
-                           in a compiler-specific directory
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-+  --enable-host-pie       build host code as PIE
-   --disable-libquadmath-support
-                           disable libquadmath support for Fortran
-   --enable-default-pie    enable Position Independent Executable as default
-@@ -32221,13 +32223,17 @@ fi
- # Enable --enable-host-shared
- # Check whether --enable-host-shared was given.
- if test "${enable_host_shared+set}" = set; then :
--  enableval=$enable_host_shared; PICFLAG=-fPIC
--else
--  PICFLAG=
-+  enableval=$enable_host_shared;
- fi
- 
- 
- 
-+# Enable --enable-host-pie
-+# Check whether --enable-host-pie was given.
-+if test "${enable_host_pie+set}" = set; then :
-+  enableval=$enable_host_pie;
-+fi
-+
- 
- 
- # Check whether --enable-libquadmath-support was given.
-@@ -32381,10 +32387,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_c_no_fpie" >&5
- $as_echo "$gcc_cv_c_no_fpie" >&6; }
--if test "$gcc_cv_c_no_fpie" = "yes"; then
--  NO_PIE_CFLAGS="-fno-PIE"
--fi
--
- 
- # Check if -no-pie works.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -no-pie option" >&5
-@@ -32409,11 +32411,28 @@ rm -f core conftest.err conftest.$ac_objext \
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_no_pie" >&5
- $as_echo "$gcc_cv_no_pie" >&6; }
--if test "$gcc_cv_no_pie" = "yes"; then
--  NO_PIE_FLAG="-no-pie"
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
-+elif test x$gcc_cv_c_no_fpie = xyes; then
-+  PICFLAG=-fno-PIE
-+else
-+  PICFLAG=
-+fi
-+
-+if test x$enable_host_pie = xyes; then
-+  LD_PICFLAG=-pie
-+elif test x$gcc_cv_no_pie = xyes; then
-+  LD_PICFLAG=-no-pie
-+else
-+  LD_PICFLAG=
- fi
- 
- 
-+
-+
- # Enable Intel CET on Intel CET enabled host if jit is enabled.
-  # Check whether --enable-cet was given.
- if test "${enable_cet+set}" = set; then :
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 06750cee977..dca995aeec7 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7488,11 +7488,14 @@ fi
- # Enable --enable-host-shared
- AC_ARG_ENABLE(host-shared,
- [AS_HELP_STRING([--enable-host-shared],
--		[build host code as shared libraries])],
--[PICFLAG=-fPIC], [PICFLAG=])
-+		[build host code as shared libraries])])
- AC_SUBST(enable_host_shared)
--AC_SUBST(PICFLAG)
- 
-+# Enable --enable-host-pie
-+AC_ARG_ENABLE(host-pie,
-+[AS_HELP_STRING([--enable-host-pie],
-+		[build host code as PIE])])
-+AC_SUBST(enable_host_pie)
- 
- AC_ARG_ENABLE(libquadmath-support,
- [AS_HELP_STRING([--disable-libquadmath-support],
-@@ -7614,10 +7617,6 @@ AC_CACHE_CHECK([for -fno-PIE option],
-      [gcc_cv_c_no_fpie=yes],
-      [gcc_cv_c_no_fpie=no])
-    CXXFLAGS="$saved_CXXFLAGS"])
--if test "$gcc_cv_c_no_fpie" = "yes"; then
--  NO_PIE_CFLAGS="-fno-PIE"
--fi
--AC_SUBST([NO_PIE_CFLAGS])
- 
- # Check if -no-pie works.
- AC_CACHE_CHECK([for -no-pie option],
-@@ -7628,10 +7627,27 @@ AC_CACHE_CHECK([for -no-pie option],
-      [gcc_cv_no_pie=yes],
-      [gcc_cv_no_pie=no])
-    LDFLAGS="$saved_LDFLAGS"])
--if test "$gcc_cv_no_pie" = "yes"; then
--  NO_PIE_FLAG="-no-pie"
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
-+elif test x$gcc_cv_c_no_fpie = xyes; then
-+  PICFLAG=-fno-PIE
-+else
-+  PICFLAG=
- fi
--AC_SUBST([NO_PIE_FLAG])
-+
-+if test x$enable_host_pie = xyes; then
-+  LD_PICFLAG=-pie
-+elif test x$gcc_cv_no_pie = xyes; then
-+  LD_PICFLAG=-no-pie
-+else
-+  LD_PICFLAG=
-+fi
-+
-+AC_SUBST([PICFLAG])
-+AC_SUBST([LD_PICFLAG])
- 
- # Enable Intel CET on Intel CET enabled host if jit is enabled.
- GCC_CET_HOST_FLAGS(CET_HOST_FLAGS)
-diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 93eae1f2582..be6985646b2 100644
---- a/gcc/doc/install.texi
-+++ b/gcc/doc/install.texi
-@@ -1021,14 +1021,26 @@ code.
- 
- @item --enable-host-shared
- Specify that the @emph{host} code should be built into position-independent
--machine code (with -fPIC), allowing it to be used within shared libraries,
--but yielding a slightly slower compiler.
-+machine code (with @option{-fPIC}), allowing it to be used within shared
-+libraries, but yielding a slightly slower compiler.
- 
- This option is required when building the libgccjit.so library.
- 
- Contrast with @option{--enable-shared}, which affects @emph{target}
- libraries.
- 
-+@item --enable-host-pie
-+Specify that the @emph{host} executables should be built into
-+position-independent executables (with @option{-fPIE} and @option{-pie}),
-+yielding a slightly slower compiler (but faster than
-+@option{--enable-host-shared}).  Position-independent executables are loaded
-+at random addresses each time they are executed, therefore provide additional
-+protection against Return Oriented Programming (ROP) attacks.
-+
-+@option{--enable-host-pie}) may be used with @option{--enable-host-shared}),
-+in which case @option{-fPIC} is used when compiling, and @option{-pie} when
-+linking.
-+
- @item @anchor{with-gnu-as}--with-gnu-as
- Specify that the compiler should assume that the
- assembler it finds is the GNU assembler.  However, this does not modify
-diff --git a/libcody/Makefile.in b/libcody/Makefile.in
-index 7eaf8ace8ce..0ff1625a39f 100644
---- a/libcody/Makefile.in
-+++ b/libcody/Makefile.in
-@@ -31,7 +31,7 @@ endif
- CXXOPTS += $(filter-out -DHAVE_CONFIG_H,@DEFS@) -include config.h
- 
- # Linker options
--LDFLAGS := @LDFLAGS@
-+LDFLAGS := @LDFLAGS@ @LD_PICFLAG@
- LIBS := @LIBS@
- 
- # Per-source & per-directory compile flags (warning: recursive)
-diff --git a/libcody/configure b/libcody/configure
-index da52a5cfca5..0e536c0ccb0 100755
---- a/libcody/configure
-+++ b/libcody/configure
-@@ -591,7 +591,10 @@ configure_args
- AR
- RANLIB
- EXCEPTIONS
-+LD_PICFLAG
- PICFLAG
-+enable_host_pie
-+enable_host_shared
- OBJEXT
- EXEEXT
- ac_ct_CXX
-@@ -653,6 +656,7 @@ enable_maintainer_mode
- with_compiler
- enable_checking
- enable_host_shared
-+enable_host_pie
- enable_exceptions
- '
-       ac_precious_vars='build_alias
-@@ -1286,6 +1290,7 @@ Optional Features:
-                           yes,no,all,none,release. Flags are: misc,valgrind or
-                           other strings
-   --enable-host-shared    build host code as shared libraries
-+  --enable-host-pie       build host code as PIE
-   --enable-exceptions     enable exceptions & rtti
- 
- Optional Packages:
-@@ -2635,11 +2640,34 @@ fi
- # Enable --enable-host-shared.
- # Check whether --enable-host-shared was given.
- if test "${enable_host_shared+set}" = set; then :
--  enableval=$enable_host_shared; PICFLAG=-fPIC
-+  enableval=$enable_host_shared;
-+fi
-+
-+
-+
-+# Enable --enable-host-pie.
-+# Check whether --enable-host-pie was given.
-+if test "${enable_host_pie+set}" = set; then :
-+  enableval=$enable_host_pie;
-+fi
-+
-+
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
- else
-   PICFLAG=
- fi
- 
-+if test x$enable_host_pie = xyes; then
-+  LD_PICFLAG=-pie
-+else
-+  LD_PICFLAG=
-+fi
-+
-+
- 
- 
- # Check whether --enable-exceptions was given.
-diff --git a/libcody/configure.ac b/libcody/configure.ac
-index 960191ecb72..14e8dd4a226 100644
---- a/libcody/configure.ac
-+++ b/libcody/configure.ac
-@@ -63,9 +63,31 @@ fi
- # Enable --enable-host-shared.
- AC_ARG_ENABLE(host-shared,
- [AS_HELP_STRING([--enable-host-shared],
--		[build host code as shared libraries])],
--[PICFLAG=-fPIC], [PICFLAG=])
-+		[build host code as shared libraries])])
-+AC_SUBST(enable_host_shared)
-+
-+# Enable --enable-host-pie.
-+AC_ARG_ENABLE(host-pie,
-+[AS_HELP_STRING([--enable-host-pie],
-+		[build host code as PIE])])
-+AC_SUBST(enable_host_pie)
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
-+else
-+  PICFLAG=
-+fi
-+
-+if test x$enable_host_pie = xyes; then
-+  LD_PICFLAG=-pie
-+else
-+  LD_PICFLAG=
-+fi
-+
- AC_SUBST(PICFLAG)
-+AC_SUBST(LD_PICFLAG)
- 
- NMS_ENABLE_EXCEPTIONS
- 
-diff --git a/libcpp/configure b/libcpp/configure
-index 75145390215..85168273cd1 100755
---- a/libcpp/configure
-+++ b/libcpp/configure
-@@ -625,6 +625,8 @@ ac_includes_default="\
- ac_subst_vars='LTLIBOBJS
- CET_HOST_FLAGS
- PICFLAG
-+enable_host_pie
-+enable_host_shared
- MAINT
- USED_CATALOGS
- PACKAGE
-@@ -738,6 +740,7 @@ enable_maintainer_mode
- enable_checking
- enable_canonical_system_headers
- enable_host_shared
-+enable_host_pie
- enable_cet
- enable_valgrind_annotations
- '
-@@ -1379,6 +1382,7 @@ Optional Features:
-   --enable-canonical-system-headers
-                           enable or disable system headers canonicalization
-   --enable-host-shared    build host code as shared libraries
-+  --enable-host-pie       build host code as PIE
-   --enable-cet            enable Intel CET in host libraries [default=auto]
-   --enable-valgrind-annotations
-                           enable valgrind runtime interaction
-@@ -7605,7 +7609,23 @@ esac
- # Enable --enable-host-shared.
- # Check whether --enable-host-shared was given.
- if test "${enable_host_shared+set}" = set; then :
--  enableval=$enable_host_shared; PICFLAG=-fPIC
-+  enableval=$enable_host_shared;
-+fi
-+
-+
-+
-+# Enable --enable-host-pie.
-+# Check whether --enable-host-pie was given.
-+if test "${enable_host_pie+set}" = set; then :
-+  enableval=$enable_host_pie;
-+fi
-+
-+
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
- else
-   PICFLAG=
- fi
-diff --git a/libcpp/configure.ac b/libcpp/configure.ac
-index 9b6042518e5..d25bf5f414f 100644
---- a/libcpp/configure.ac
-+++ b/libcpp/configure.ac
-@@ -211,8 +211,23 @@ esac
- # Enable --enable-host-shared.
- AC_ARG_ENABLE(host-shared,
- [AS_HELP_STRING([--enable-host-shared],
--		[build host code as shared libraries])],
--[PICFLAG=-fPIC], [PICFLAG=])
-+		[build host code as shared libraries])])
-+AC_SUBST(enable_host_shared)
-+
-+# Enable --enable-host-pie.
-+AC_ARG_ENABLE(host-pie,
-+[AS_HELP_STRING([--enable-host-pie],
-+		[build host code as PIE])])
-+AC_SUBST(enable_host_pie)
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
-+else
-+  PICFLAG=
-+fi
-+
- AC_SUBST(PICFLAG)
- 
- # Enable Intel CET on Intel CET enabled host if jit is enabled.
-diff --git a/libdecnumber/configure b/libdecnumber/configure
-index da5302f9315..d805fdeab5a 100755
---- a/libdecnumber/configure
-+++ b/libdecnumber/configure
-@@ -626,6 +626,8 @@ ac_subst_vars='LTLIBOBJS
- LIBOBJS
- CET_HOST_FLAGS
- PICFLAG
-+enable_host_pie
-+enable_host_shared
- ADDITIONAL_OBJS
- enable_decimal_float
- target_os
-@@ -706,6 +708,7 @@ enable_werror_always
- enable_maintainer_mode
- enable_decimal_float
- enable_host_shared
-+enable_host_pie
- enable_cet
- '
-       ac_precious_vars='build_alias
-@@ -1338,6 +1341,7 @@ Optional Features:
- 			or 'dpd' choses which decimal floating point format
- 			to use
-   --enable-host-shared    build host code as shared libraries
-+  --enable-host-pie       build host code as PIE
-   --enable-cet            enable Intel CET in host libraries [default=auto]
- 
- Some influential environment variables:
-@@ -5185,7 +5189,23 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
- # Enable --enable-host-shared.
- # Check whether --enable-host-shared was given.
- if test "${enable_host_shared+set}" = set; then :
--  enableval=$enable_host_shared; PICFLAG=-fPIC
-+  enableval=$enable_host_shared;
-+fi
-+
-+
-+
-+# Enable --enable-host-pie.
-+# Check whether --enable-host-pie was given.
-+if test "${enable_host_pie+set}" = set; then :
-+  enableval=$enable_host_pie;
-+fi
-+
-+
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
- else
-   PICFLAG=
- fi
-diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac
-index 0794031ec83..14f67f926d1 100644
---- a/libdecnumber/configure.ac
-+++ b/libdecnumber/configure.ac
-@@ -100,8 +100,23 @@ AC_C_BIGENDIAN
- # Enable --enable-host-shared.
- AC_ARG_ENABLE(host-shared,
- [AS_HELP_STRING([--enable-host-shared],
--		[build host code as shared libraries])],
--[PICFLAG=-fPIC], [PICFLAG=])
-+		[build host code as shared libraries])])
-+AC_SUBST(enable_host_shared)
-+
-+# Enable --enable-host-pie.
-+AC_ARG_ENABLE(host-pie,
-+[AS_HELP_STRING([--enable-host-pie],
-+		[build host code as PIE])])
-+AC_SUBST(enable_host_pie)
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
-+else
-+  PICFLAG=
-+fi
-+
- AC_SUBST(PICFLAG)
- 
- # Enable Intel CET on Intel CET enabled host if jit is enabled.
-diff --git a/zlib/configure b/zlib/configure
-index f489f31bc70..0dfc1982844 100755
---- a/zlib/configure
-+++ b/zlib/configure
-@@ -635,6 +635,8 @@ am__EXEEXT_TRUE
- LTLIBOBJS
- LIBOBJS
- PICFLAG
-+enable_host_pie
-+enable_host_shared
- TARGET_LIBRARY_FALSE
- TARGET_LIBRARY_TRUE
- toolexeclibdir
-@@ -778,6 +780,7 @@ with_gnu_ld
- enable_libtool_lock
- with_toolexeclibdir
- enable_host_shared
-+enable_host_pie
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1420,6 +1423,7 @@ Optional Features:
-                           optimize for fast installation [default=yes]
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-   --enable-host-shared    build host code as shared libraries
-+  --enable-host-pie       build host code as PIE
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -4169,7 +4173,7 @@ case "$host" in
-     case "$enable_cet" in
-       auto)
- 	# Check if target supports multi-byte NOPs
--	# and if assembler supports CET insn.
-+	# and if compiler and assembler support CET insn.
- 	cet_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -fcf-protection"
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11524,15 +11528,31 @@ else
-   multilib_arg=
- fi
- 
-+# Enable --enable-host-shared.
- # Check whether --enable-host-shared was given.
- if test "${enable_host_shared+set}" = set; then :
--  enableval=$enable_host_shared; PICFLAG=-fPIC
-+  enableval=$enable_host_shared;
-+fi
-+
-+
-+
-+# Enable --enable-host-pie.
-+# Check whether --enable-host-pie was given.
-+if test "${enable_host_pie+set}" = set; then :
-+  enableval=$enable_host_pie;
-+fi
-+
-+
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
- else
-   PICFLAG=
- fi
- 
- 
--
- ac_config_files="$ac_config_files Makefile"
- 
- cat >confcache <<\_ACEOF
-diff --git a/zlib/configure.ac b/zlib/configure.ac
-index be1cfe29651..adf7aad4e51 100644
---- a/zlib/configure.ac
-+++ b/zlib/configure.ac
-@@ -122,11 +122,26 @@ else
-   multilib_arg=
- fi
- 
-+# Enable --enable-host-shared.
- AC_ARG_ENABLE(host-shared,
- [AS_HELP_STRING([--enable-host-shared],
--		[build host code as shared libraries])],
--[PICFLAG=-fPIC], [PICFLAG=])
--AC_SUBST(PICFLAG)
-+		[build host code as shared libraries])])
-+AC_SUBST(enable_host_shared)
-+
-+# Enable --enable-host-pie.
-+AC_ARG_ENABLE(host-pie,
-+[AS_HELP_STRING([--enable-host-pie],
-+		[build host code as PIE])])
-+AC_SUBST(enable_host_pie)
-+
-+if test x$enable_host_shared = xyes; then
-+  PICFLAG=-fPIC
-+elif test x$enable_host_pie = xyes; then
-+  PICFLAG=-fPIE
-+else
-+  PICFLAG=
-+fi
- 
-+AC_SUBST(PICFLAG)
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
-
-base-commit: ee50b4383a0dca88172c3a821418344bd7391956
--- 
-2.34.1
-

SOURCES/gcc11-pr101786.patch

@@ -1,66 +0,0 @@
-c++: Optimize constinit thread_local vars [PR101786]
-
-The paper that introduced constinit mentioned in rationale that constinit
-can be used on externs as well and that it can be used to avoid the
-thread_local initialization wrappers, because the standard requires that
-if constinit is present on any declaration, it is also present on the
-initialization declaration, even if it is in some other TU etc.
-
-There is a small problem though, we use the tls wrappers not just if
-the thread_local variable needs dynamic initialization, but also when
-it has static initialization, but non-trivial destructor, as the
-"dynamic initialization" in that case needs to register the destructor.
-
-So, the following patch optimizes constinit thread_local vars only
-if we can prove they will not have non-trivial destructors.  That includes
-the case where we have incomplete type where we don't know and need to
-conservatively assume the type will have non-trivial destructor at the
-initializing declaration side.
-
-2021-08-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/101786
-	* decl2.c (var_defined_without_dynamic_init): Return true for
-	DECL_DECLARED_CONSTINIT_P with complete type and trivial destructor.
-
-	* g++.dg/cpp2a/constinit16.C: New test.
-
---- gcc/cp/decl2.c
-+++ gcc/cp/decl2.c
-@@ -3447,6 +3447,12 @@ set_guard (tree guard)
- static bool
- var_defined_without_dynamic_init (tree var)
- {
-+  /* constinit vars are guaranteed to not have dynamic initializer,
-+     but still registering the destructor counts as dynamic initialization.  */
-+  if (DECL_DECLARED_CONSTINIT_P (var)
-+      && COMPLETE_TYPE_P (TREE_TYPE (var))
-+      && !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (var)))
-+    return true;
-   /* If it's defined in another TU, we can't tell.  */
-   if (DECL_EXTERNAL (var))
-     return false;
---- gcc/testsuite/g++.dg/cpp2a/constinit16.C
-+++ gcc/testsuite/g++.dg/cpp2a/constinit16.C
-@@ -0,0 +1,21 @@
-+// PR c++/101786
-+// { dg-do compile { target c++20 } }
-+// { dg-add-options tls }
-+// { dg-require-alias "" }
-+// { dg-require-effective-target tls_runtime }
-+// { dg-final { scan-assembler-not "_ZTH17mythreadlocalvar1" } }
-+// { dg-final { scan-assembler "_ZTH17mythreadlocalvar2" } }
-+// { dg-final { scan-assembler-not "_ZTH17mythreadlocalvar3" } }
-+// { dg-final { scan-assembler "_ZTH17mythreadlocalvar4" } }
-+
-+extern thread_local constinit int mythreadlocalvar1;
-+struct S;
-+extern thread_local constinit S mythreadlocalvar2;
-+struct T { int t; };
-+extern thread_local constinit T mythreadlocalvar3;
-+struct U { int u; ~U (); };
-+extern thread_local constinit U mythreadlocalvar4;
-+int foo () { return mythreadlocalvar1; }
-+S *bar () { return &mythreadlocalvar2; }
-+T *baz () { return &mythreadlocalvar3; }
-+U *qux () { return &mythreadlocalvar4; }

SOURCES/gcc11-pr105157.patch

@@ -1,105 +0,0 @@
-The original patch had
-#define TARGET_CPU_NBITS 8
-but I've changed it to
-#define TARGET_CPU_NBITS 7
-
-commit 5522dec054cb940fe83661b96249aa12c54c1d77
-Author: Andre Vieira <andre.simoesdiasvieira@arm.com>
-Date:   Fri Apr 8 15:12:23 2022 +0100
-
-    aarch64: PR target/105157 Increase number of cores TARGET_CPU_DEFAULT can encode
-    
-    This addresses the compile-time increase seen in the PR target/105157. This was
-    being caused by selecting the wrong core tuning, as when we added the latest
-    AArch64 the TARGET_CPU_generic tuning was pushed beyond the 0x3f mask we used
-    to encode both target cpu and attributes into TARGET_CPU_DEFAULT.
-    
-    gcc/ChangeLog:
-    
-            PR target/105157
-            * config.gcc: Shift ext_mask by TARGET_CPU_NBITS.
-            * config/aarch64/aarch64.h (TARGET_CPU_NBITS): New macro.
-            (TARGET_CPU_MASK): Likewise.
-            (TARGET_CPU_DEFAULT): Use TARGET_CPU_NBITS.
-            * config/aarch64/aarch64.cc (aarch64_get_tune_cpu): Use TARGET_CPU_MASK.
-            (aarch64_get_arch): Likewise.
-            (aarch64_override_options): Use TARGET_CPU_NBITS.
-
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -4261,7 +4261,7 @@ case "${target}" in
- 				ext_val=`echo $ext_val | sed -e 's/[a-z0-9]\+//'`
- 			  done
- 
--			  ext_mask="(("$ext_mask") << 6)"
-+			  ext_mask="(("$ext_mask") << TARGET_CPU_NBITS)"
- 			  if [ x"$base_id" != x ]; then
- 				target_cpu_cname="TARGET_CPU_$base_id | $ext_mask"
- 			  fi
---- a/gcc/config/aarch64/aarch64.c
-+++ b/gcc/config/aarch64/aarch64.c
-@@ -18053,6 +18053,9 @@ aarch64_validate_mtune (const char *str, const struct processor **res)
-   return false;
- }
- 
-+static_assert (TARGET_CPU_generic < TARGET_CPU_MASK,
-+	       "TARGET_CPU_NBITS is big enough");
-+
- /* Return the CPU corresponding to the enum CPU.
-    If it doesn't specify a cpu, return the default.  */
- 
-@@ -18062,12 +18065,12 @@ aarch64_get_tune_cpu (enum aarch64_processor cpu)
-   if (cpu != aarch64_none)
-     return &all_cores[cpu];
- 
--  /* The & 0x3f is to extract the bottom 6 bits that encode the
--     default cpu as selected by the --with-cpu GCC configure option
-+  /* The & TARGET_CPU_MASK is to extract the bottom TARGET_CPU_NBITS bits that
-+     encode the default cpu as selected by the --with-cpu GCC configure option
-      in config.gcc.
-      ???: The whole TARGET_CPU_DEFAULT and AARCH64_CPU_DEFAULT_FLAGS
-      flags mechanism should be reworked to make it more sane.  */
--  return &all_cores[TARGET_CPU_DEFAULT & 0x3f];
-+  return &all_cores[TARGET_CPU_DEFAULT & TARGET_CPU_MASK];
- }
- 
- /* Return the architecture corresponding to the enum ARCH.
-@@ -18079,7 +18082,8 @@ aarch64_get_arch (enum aarch64_arch arch)
-   if (arch != aarch64_no_arch)
-     return &all_architectures[arch];
- 
--  const struct processor *cpu = &all_cores[TARGET_CPU_DEFAULT & 0x3f];
-+  const struct processor *cpu
-+    = &all_cores[TARGET_CPU_DEFAULT & TARGET_CPU_MASK];
- 
-   return &all_architectures[cpu->arch];
- }
-@@ -18166,7 +18170,7 @@ aarch64_override_options (void)
- 	{
- 	  /* Get default configure-time CPU.  */
- 	  selected_cpu = aarch64_get_tune_cpu (aarch64_none);
--	  aarch64_isa_flags = TARGET_CPU_DEFAULT >> 6;
-+	  aarch64_isa_flags = TARGET_CPU_DEFAULT >> TARGET_CPU_NBITS;
- 	}
- 
-       if (selected_tune)
---- a/gcc/config/aarch64/aarch64.h
-+++ b/gcc/config/aarch64/aarch64.h
-@@ -813,10 +813,16 @@ enum target_cpus
-   TARGET_CPU_generic
- };
- 
-+/* Define how many bits are used to represent the CPU in TARGET_CPU_DEFAULT.
-+   This needs to be big enough to fit the value of TARGET_CPU_generic.
-+   All bits after this are used to represent the AARCH64_CPU_DEFAULT_FLAGS.  */
-+#define TARGET_CPU_NBITS 7
-+#define TARGET_CPU_MASK ((1 << TARGET_CPU_NBITS) - 1)
-+
- /* If there is no CPU defined at configure, use generic as default.  */
- #ifndef TARGET_CPU_DEFAULT
- #define TARGET_CPU_DEFAULT \
--  (TARGET_CPU_generic | (AARCH64_CPU_DEFAULT_FLAGS << 6))
-+  (TARGET_CPU_generic | (AARCH64_CPU_DEFAULT_FLAGS << TARGET_CPU_NBITS))
- #endif
- 
- /* If inserting NOP before a mult-accumulate insn remember to adjust the

SOURCES/gcc11-pr113960.patch

@@ -1,107 +0,0 @@
-commit 6f5dcea85a31845ec6f4b6886734b0f02e013718
-Author: Jonathan Wakely <jwakely@redhat.com>
-Date:   Tue Feb 27 17:50:34 2024 +0000
-
-    libstdc++: Fix conditions for using memcmp in std::lexicographical_compare_three_way [PR113960]
-    
-    The change in r11-2981-g2f983fa69005b6 meant that
-    std::lexicographical_compare_three_way started to use memcmp for
-    unsigned integers on big endian targets, but for that to be valid we
-    need the two value types to have the same size and we need to use that
-    size to compute the length passed to memcmp.
-    
-    I already defined a __is_memcmp_ordered_with trait that does the right
-    checks, std::lexicographical_compare_three_way just needs to use it.
-    
-    libstdc++-v3/ChangeLog:
-    
-            PR libstdc++/113960
-            * include/bits/stl_algobase.h (__is_byte_iter): Replace with ...
-            (__memcmp_ordered_with): New concept.
-            (lexicographical_compare_three_way): Use __memcmp_ordered_with
-            instead of __is_byte_iter. Use correct length for memcmp.
-            * testsuite/25_algorithms/lexicographical_compare_three_way/113960.cc:
-            New test.
-    
-    (cherry picked from commit f5cdda8acb06c20335855ed353ab9a441c12128a)
-
-diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
-index 7664301a208..6e648e48ad0 100644
---- a/libstdc++-v3/include/bits/stl_algobase.h
-+++ b/libstdc++-v3/include/bits/stl_algobase.h
-@@ -1780,11 +1780,14 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
-     }
- 
- #if __cpp_lib_three_way_comparison
--  // Iter points to a contiguous range of unsigned narrow character type
--  // or std::byte, suitable for comparison by memcmp.
--  template<typename _Iter>
--    concept __is_byte_iter = contiguous_iterator<_Iter>
--      && __is_memcmp_ordered<iter_value_t<_Iter>>::__value;
-+  // Both iterators refer to contiguous ranges of unsigned narrow characters,
-+  // or std::byte, or big-endian unsigned integers, suitable for comparison
-+  // using memcmp.
-+  template<typename _Iter1, typename _Iter2>
-+    concept __memcmp_ordered_with
-+      = (__is_memcmp_ordered_with<iter_value_t<_Iter1>,
-+				  iter_value_t<_Iter2>>::__value)
-+	  && contiguous_iterator<_Iter1> && contiguous_iterator<_Iter2>;
- 
-   // Return a struct with two members, initialized to the smaller of x and y
-   // (or x if they compare equal) and the result of the comparison x <=> y.
-@@ -1834,20 +1837,20 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
-       if (!std::is_constant_evaluated())
- 	if constexpr (same_as<_Comp, __detail::_Synth3way>
- 		      || same_as<_Comp, compare_three_way>)
--	  if constexpr (__is_byte_iter<_InputIter1>)
--	    if constexpr (__is_byte_iter<_InputIter2>)
--	      {
--		const auto [__len, __lencmp] = _GLIBCXX_STD_A::
--		  __min_cmp(__last1 - __first1, __last2 - __first2);
--		if (__len)
--		  {
--		    const auto __c
--		      = __builtin_memcmp(&*__first1, &*__first2, __len) <=> 0;
--		    if (__c != 0)
--		      return __c;
--		  }
--		return __lencmp;
--	      }
-+	  if constexpr (__memcmp_ordered_with<_InputIter1, _InputIter2>)
-+	    {
-+	      const auto [__len, __lencmp] = _GLIBCXX_STD_A::
-+		__min_cmp(__last1 - __first1, __last2 - __first2);
-+	      if (__len)
-+		{
-+		  const auto __blen = __len * sizeof(*__first1);
-+		  const auto __c
-+		    = __builtin_memcmp(&*__first1, &*__first2, __blen) <=> 0;
-+		  if (__c != 0)
-+		    return __c;
-+		}
-+	      return __lencmp;
-+	    }
- #endif // is_constant_evaluated
-       while (__first1 != __last1)
- 	{
-diff --git a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare_three_way/113960.cc b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare_three_way/113960.cc
-new file mode 100644
-index 00000000000..d51ae1a3d50
---- /dev/null
-+++ b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare_three_way/113960.cc
-@@ -0,0 +1,15 @@
-+// { dg-do run { target c++20 } }
-+
-+// PR libstdc++/113960
-+// std::map with std::vector as input overwrites itself with c++20, on s390x
-+
-+#include <algorithm>
-+#include <testsuite_hooks.h>
-+
-+int main()
-+{
-+  unsigned short a1[] { 1, 2, 3 };
-+  unsigned short a2[] { 1, 2, 4 };
-+  // Incorrect memcmp comparison for big endian targets.
-+  VERIFY( std::lexicographical_compare_three_way(a1, a1+3, a2, a2+3) < 0 );
-+}

SOURCES/gcc11-pr116034.patch

@@ -1,65 +0,0 @@
-commit 084768c865cd50a6f7ff177db2dbdbb7aadaeee0
-Author: Jakub Jelinek <jakub@redhat.com>
-Date:   Tue Jul 23 10:50:29 2024 +0200
-
-    ssa: Fix up maybe_rewrite_mem_ref_base complex type handling [PR116034]
-    
-    The folding into REALPART_EXPR is correct, used only when the mem_offset
-    is zero, but for IMAGPART_EXPR it didn't check the exact offset value (just
-    that it is not 0).
-    The following patch fixes that by using IMAGPART_EXPR only if the offset
-    is right and using BITFIELD_REF or whatever else otherwise.
-    
-    2024-07-23  Jakub Jelinek  <jakub@redhat.com>
-                Andrew Pinski  <quic_apinski@quicinc.com>
-    
-            PR tree-optimization/116034
-            * tree-ssa.c (maybe_rewrite_mem_ref_base): Only use IMAGPART_EXPR
-            if MEM_REF offset is equal to element type size.
-    
-            * gcc.dg/pr116034.c: New test.
-    
-    (cherry picked from commit b9cefd67a2a464a3c9413e6b3f28e7dc7a9ef162)
-
-diff --git a/gcc/testsuite/gcc.dg/pr116034.c b/gcc/testsuite/gcc.dg/pr116034.c
-new file mode 100644
-index 00000000000..9a31de03424
---- /dev/null
-+++ b/gcc/testsuite/gcc.dg/pr116034.c
-@@ -0,0 +1,22 @@
-+/* PR tree-optimization/116034 */
-+/* { dg-do run } */
-+/* { dg-options "-O1 -fno-strict-aliasing" } */
-+
-+int g;
-+
-+static inline int
-+foo (_Complex unsigned short c)
-+{
-+  __builtin_memmove (&g, 1 + (char *) &c, 2);
-+  return g;
-+}
-+
-+int
-+main ()
-+{
-+  if (__SIZEOF_SHORT__ == 2
-+      && __CHAR_BIT__ == 8
-+      && (foo (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__ ? 0x100 : 1)
-+	  != (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__ ? 1 : 0x100)))
-+    __builtin_abort ();
-+}
---- a/gcc/tree-ssa.c
-+++ b/gcc/tree-ssa.c
-@@ -1506,7 +1506,10 @@ maybe_rewrite_mem_ref_base (tree *tp, bitmap suitable_for_renaming)
- 	}
-       else if (TREE_CODE (TREE_TYPE (sym)) == COMPLEX_TYPE
- 	       && useless_type_conversion_p (TREE_TYPE (*tp),
--					     TREE_TYPE (TREE_TYPE (sym))))
-+					     TREE_TYPE (TREE_TYPE (sym)))
-+	       && (integer_zerop (TREE_OPERAND (*tp, 1))
-+		   || tree_int_cst_equal (TREE_OPERAND (*tp, 1),
-+					  TYPE_SIZE_UNIT (TREE_TYPE (*tp)))))
- 	{
- 	  *tp = build1 (integer_zerop (TREE_OPERAND (*tp, 1))
- 			? REALPART_EXPR : IMAGPART_EXPR,

SOURCES/gcc11-stringify-__VA_OPT__-2.patch

@@ -1,197 +0,0 @@
-libcpp: Fix up #__VA_OPT__ handling [PR103415]
-
-stringify_arg uses pfile->u_buff to create the string literal.
-Unfortunately, paste_tokens -> _cpp_lex_direct -> lex_number -> _cpp_unaligned_alloc
-can in some cases use pfile->u_buff too, which results in losing everything
-prepared for the string literal until the token pasting.
-
-The following patch fixes that by not calling paste_token during the
-construction of the string literal, but doing that before.  All the tokens
-we are processing have been pushed into a token buffer using
-tokens_buff_add_token so it is fine if we paste some of them in that buffer
-(successful pasting creates a new token in that buffer), move following
-tokens if any to make it contiguous, pop (throw away) the extra tokens at
-the end and then do stringify_arg.
-
-Also, paste_tokens now copies over PREV_WHITE and PREV_FALLTHROUGH flags
-from the original lhs token to the replacement token.  Copying that way
-the PREV_WHITE flag is needed for the #__VA_OPT__ handling and copying
-over PREV_FALLTHROUGH fixes the new Wimplicit-fallthrough-38.c test.
-
-2021-12-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR preprocessor/103415
-libcpp/
-	* macro.c (stringify_arg): Remove va_opt argument and va_opt handling.
-	(paste_tokens): On successful paste or in PREV_WHITE and
-	PREV_FALLTHROUGH flags from the *plhs token to the new token.
-	(replace_args): Adjust stringify_arg callers.  For #__VA_OPT__,
-	perform token pasting in a separate loop before stringify_arg call.
-gcc/testsuite/
-	* c-c++-common/cpp/va-opt-8.c: New test.
-	* c-c++-common/Wimplicit-fallthrough-38.c: New test.
-
---- libcpp/macro.c.jj
-+++ libcpp/macro.c
-@@ -295,7 +295,7 @@ static cpp_context *next_context (cpp_re
- static const cpp_token *padding_token (cpp_reader *, const cpp_token *);
- static const cpp_token *new_string_token (cpp_reader *, uchar *, unsigned int);
- static const cpp_token *stringify_arg (cpp_reader *, const cpp_token **,
--				       unsigned int, bool);
-+				       unsigned int);
- static void paste_all_tokens (cpp_reader *, const cpp_token *);
- static bool paste_tokens (cpp_reader *, location_t,
- 			  const cpp_token **, const cpp_token *);
-@@ -826,8 +826,7 @@ cpp_quote_string (uchar *dest, const uch
- /* Convert a token sequence FIRST to FIRST+COUNT-1 to a single string token
-    according to the rules of the ISO C #-operator.  */
- static const cpp_token *
--stringify_arg (cpp_reader *pfile, const cpp_token **first, unsigned int count,
--	       bool va_opt)
-+stringify_arg (cpp_reader *pfile, const cpp_token **first, unsigned int count)
- {
-   unsigned char *dest;
-   unsigned int i, escape_it, backslash_count = 0;
-@@ -844,24 +843,6 @@ stringify_arg (cpp_reader *pfile, const
-     {
-       const cpp_token *token = first[i];
- 
--      if (va_opt && (token->flags & PASTE_LEFT))
--	{
--	  location_t virt_loc = pfile->invocation_location;
--	  const cpp_token *rhs;
--	  do
--	    {
--	      if (i == count)
--		abort ();
--	      rhs = first[++i];
--	      if (!paste_tokens (pfile, virt_loc, &token, rhs))
--		{
--		  --i;
--		  break;
--		}
--	    }
--	  while (rhs->flags & PASTE_LEFT);
--	}
--
-       if (token->type == CPP_PADDING)
- 	{
- 	  if (source == NULL
-@@ -995,6 +976,7 @@ paste_tokens (cpp_reader *pfile, locatio
-       return false;
-     }
- 
-+  lhs->flags |= (*plhs)->flags & (PREV_WHITE | PREV_FALLTHROUGH);
-   *plhs = lhs;
-   _cpp_pop_buffer (pfile);
-   return true;
-@@ -1937,8 +1919,7 @@ replace_args (cpp_reader *pfile, cpp_has
- 	if (src->flags & STRINGIFY_ARG)
- 	  {
- 	    if (!arg->stringified)
--	      arg->stringified = stringify_arg (pfile, arg->first, arg->count,
--						false);
-+	      arg->stringified = stringify_arg (pfile, arg->first, arg->count);
- 	  }
- 	else if ((src->flags & PASTE_LEFT)
- 		 || (src != macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))
-@@ -2065,11 +2046,46 @@ replace_args (cpp_reader *pfile, cpp_has
- 		{
- 		  unsigned int count
- 		    = start ? paste_flag - start : tokens_buff_count (buff);
--		  const cpp_token *t
--		    = stringify_arg (pfile,
--				     start ? start + 1
--				     : (const cpp_token **) (buff->base),
--				     count, true);
-+		  const cpp_token **first
-+		    = start ? start + 1
-+			    : (const cpp_token **) (buff->base);
-+		  unsigned int i, j;
-+
-+		  /* Paste any tokens that need to be pasted before calling
-+		     stringify_arg, because stringify_arg uses pfile->u_buff
-+		     which paste_tokens can use as well.  */
-+		  for (i = 0, j = 0; i < count; i++, j++)
-+		    {
-+		      const cpp_token *token = first[i];
-+
-+		      if (token->flags & PASTE_LEFT)
-+			{
-+			  location_t virt_loc = pfile->invocation_location;
-+			  const cpp_token *rhs;
-+			  do
-+			    {
-+			      if (i == count)
-+				abort ();
-+			      rhs = first[++i];
-+			      if (!paste_tokens (pfile, virt_loc, &token, rhs))
-+				{
-+				  --i;
-+				  break;
-+				}
-+			    }
-+			  while (rhs->flags & PASTE_LEFT);
-+			}
-+
-+		      first[j] = token;
-+		    }
-+		  if (j != i)
-+		    {
-+		      while (i-- != j)
-+			tokens_buff_remove_last_token (buff);
-+		      count = j;
-+		    }
-+
-+		  const cpp_token *t = stringify_arg (pfile, first, count);
- 		  while (count--)
- 		    tokens_buff_remove_last_token (buff);
- 		  if (src->flags & PASTE_LEFT)
---- gcc/testsuite/c-c++-common/cpp/va-opt-8.c.jj
-+++ gcc/testsuite/c-c++-common/cpp/va-opt-8.c
-@@ -0,0 +1,18 @@
-+/* PR preprocessor/103415 */
-+/* { dg-do run } */
-+/* { dg-options "-std=gnu99" { target c } } */
-+/* { dg-options "-std=c++20" { target c++ } } */
-+
-+#define n(x, ...) = #__VA_OPT__(x##3)
-+#define o(x, ...) #__VA_OPT__(x##__VA_ARGS__##9)
-+const char *c n(1 2, 4);
-+const char *d = o(5  6, 7	8);
-+
-+int
-+main ()
-+{
-+  if (__builtin_strcmp (c, "1 23")
-+      || __builtin_strcmp (d, "5 67 89"))
-+    __builtin_abort ();
-+  return 0;
-+}
---- gcc/testsuite/c-c++-common/Wimplicit-fallthrough-38.c.jj
-+++ gcc/testsuite/c-c++-common/Wimplicit-fallthrough-38.c
-@@ -0,0 +1,24 @@
-+/* { dg-do compile } */
-+/* { dg-options "-Wimplicit-fallthrough=3" } */
-+
-+#define FOO \
-+int				\
-+foo (int a)			\
-+{				\
-+  switch (a)			\
-+    {				\
-+    case 1:			\
-+      ++a;			\
-+      /* FALLTHRU */		\
-+    case 2:			\
-+      ++a;			\
-+      /* FALLTHRU */		\
-+    ca##se 3:			\
-+      ++a;			\
-+    default:			\
-+      break;			\
-+    }				\
-+  return a;			\
-+}
-+
-+FOO

SOURCES/gcc11-stringify-__VA_OPT__.patch

@@ -1,307 +0,0 @@
-c++: Add C++20 #__VA_OPT__ support
-
-The following patch implements C++20 # __VA_OPT__ (...) support.
-Testcases cover what I came up with myself and what LLVM has for #__VA_OPT__
-in its testsuite and the string literals are identical between the two
-compilers on the va-opt-5.c testcase.
-
-2021-08-17  Jakub Jelinek  <jakub@redhat.com>
-
-libcpp/
-	* macro.c (vaopt_state): Add m_stringify member.
-	(vaopt_state::vaopt_state): Initialize it.
-	(vaopt_state::update): Overwrite it.
-	(vaopt_state::stringify): New method.
-	(stringify_arg): Replace arg argument with first, count arguments
-	and add va_opt argument.  Use first instead of arg->first and
-	count instead of arg->count, for va_opt add paste_tokens handling.
-	(paste_tokens): Fix up len calculation.  Don't spell rhs twice,
-	instead use %.*s to supply lhs and rhs spelling lengths.  Don't call
-	_cpp_backup_tokens here.
-	(paste_all_tokens): Call it here instead.
-	(replace_args): Adjust stringify_arg caller.  For vaopt_state::END
-	if stringify is true handle __VA_OPT__ stringification.
-	(create_iso_definition): Handle # __VA_OPT__ similarly to # macro_arg.
-gcc/testsuite/
-	* c-c++-common/cpp/va-opt-5.c: New test.
-	* c-c++-common/cpp/va-opt-6.c: New test.
-
---- libcpp/macro.c
-+++ libcpp/macro.c
-@@ -118,6 +118,7 @@ class vaopt_state {
-     m_arg (arg),
-     m_variadic (is_variadic),
-     m_last_was_paste (false),
-+    m_stringify (false),
-     m_state (0),
-     m_paste_location (0),
-     m_location (0),
-@@ -145,6 +146,7 @@ class vaopt_state {
- 	  }
- 	++m_state;
- 	m_location = token->src_loc;
-+	m_stringify = (token->flags & STRINGIFY_ARG) != 0;
- 	return BEGIN;
-       }
-     else if (m_state == 1)
-@@ -234,6 +236,12 @@ class vaopt_state {
-     return m_state == 0;
-   }
- 
-+  /* Return true for # __VA_OPT__.  */
-+  bool stringify () const
-+  {
-+    return m_stringify;
-+  }
-+
-  private:
- 
-   /* The cpp_reader.  */
-@@ -247,6 +255,8 @@ class vaopt_state {
-   /* If true, the previous token was ##.  This is used to detect when
-      a paste occurs at the end of the sequence.  */
-   bool m_last_was_paste;
-+  /* True for #__VA_OPT__.  */
-+  bool m_stringify;
- 
-   /* The state variable:
-      0 means not parsing
-@@ -284,7 +294,8 @@ static _cpp_buff *collect_args (cpp_read
- static cpp_context *next_context (cpp_reader *);
- static const cpp_token *padding_token (cpp_reader *, const cpp_token *);
- static const cpp_token *new_string_token (cpp_reader *, uchar *, unsigned int);
--static const cpp_token *stringify_arg (cpp_reader *, macro_arg *);
-+static const cpp_token *stringify_arg (cpp_reader *, const cpp_token **,
-+				       unsigned int, bool);
- static void paste_all_tokens (cpp_reader *, const cpp_token *);
- static bool paste_tokens (cpp_reader *, location_t,
- 			  const cpp_token **, const cpp_token *);
-@@ -812,10 +823,11 @@ cpp_quote_string (uchar *dest, const uch
-   return dest;
- }
- 
--/* Convert a token sequence ARG to a single string token according to
--   the rules of the ISO C #-operator.  */
-+/* Convert a token sequence FIRST to FIRST+COUNT-1 to a single string token
-+   according to the rules of the ISO C #-operator.  */
- static const cpp_token *
--stringify_arg (cpp_reader *pfile, macro_arg *arg)
-+stringify_arg (cpp_reader *pfile, const cpp_token **first, unsigned int count,
-+	       bool va_opt)
- {
-   unsigned char *dest;
-   unsigned int i, escape_it, backslash_count = 0;
-@@ -828,9 +840,27 @@ stringify_arg (cpp_reader *pfile, macro_
-   *dest++ = '"';
- 
-   /* Loop, reading in the argument's tokens.  */
--  for (i = 0; i < arg->count; i++)
-+  for (i = 0; i < count; i++)
-     {
--      const cpp_token *token = arg->first[i];
-+      const cpp_token *token = first[i];
-+
-+      if (va_opt && (token->flags & PASTE_LEFT))
-+	{
-+	  location_t virt_loc = pfile->invocation_location;
-+	  const cpp_token *rhs;
-+	  do
-+	    {
-+	      if (i == count)
-+		abort ();
-+	      rhs = first[++i];
-+	      if (!paste_tokens (pfile, virt_loc, &token, rhs))
-+		{
-+		  --i;
-+		  break;
-+		}
-+	    }
-+	  while (rhs->flags & PASTE_LEFT);
-+	}
- 
-       if (token->type == CPP_PADDING)
- 	{
-@@ -917,7 +947,7 @@ paste_tokens (cpp_reader *pfile, locatio
-   cpp_token *lhs;
-   unsigned int len;
- 
--  len = cpp_token_len (*plhs) + cpp_token_len (rhs) + 1;
-+  len = cpp_token_len (*plhs) + cpp_token_len (rhs) + 2;
-   buf = (unsigned char *) alloca (len);
-   end = lhsend = cpp_spell_token (pfile, *plhs, buf, true);
- 
-@@ -943,8 +973,10 @@ paste_tokens (cpp_reader *pfile, locatio
-       location_t saved_loc = lhs->src_loc;
- 
-       _cpp_pop_buffer (pfile);
--      _cpp_backup_tokens (pfile, 1);
--      *lhsend = '\0';
-+
-+      unsigned char *rhsstart = lhsend;
-+      if ((*plhs)->type == CPP_DIV && rhs->type != CPP_EQ)
-+	rhsstart++;
- 
-       /* We have to remove the PASTE_LEFT flag from the old lhs, but
- 	 we want to keep the new location.  */
-@@ -956,8 +988,10 @@ paste_tokens (cpp_reader *pfile, locatio
-       /* Mandatory error for all apart from assembler.  */
-       if (CPP_OPTION (pfile, lang) != CLK_ASM)
- 	cpp_error_with_line (pfile, CPP_DL_ERROR, location, 0,
--	 "pasting \"%s\" and \"%s\" does not give a valid preprocessing token",
--		   buf, cpp_token_as_text (pfile, rhs));
-+			     "pasting \"%.*s\" and \"%.*s\" does not give "
-+			     "a valid preprocessing token",
-+			     (int) (lhsend - buf), buf,
-+			     (int) (end - rhsstart), rhsstart);
-       return false;
-     }
- 
-@@ -1033,7 +1067,10 @@ paste_all_tokens (cpp_reader *pfile, con
- 	    abort ();
- 	}
-       if (!paste_tokens (pfile, virt_loc, &lhs, rhs))
--	break;
-+	{
-+	  _cpp_backup_tokens (pfile, 1);
-+	  break;
-+	}
-     }
-   while (rhs->flags & PASTE_LEFT);
- 
-@@ -1900,7 +1937,8 @@ replace_args (cpp_reader *pfile, cpp_has
- 	if (src->flags & STRINGIFY_ARG)
- 	  {
- 	    if (!arg->stringified)
--	      arg->stringified = stringify_arg (pfile, arg);
-+	      arg->stringified = stringify_arg (pfile, arg->first, arg->count,
-+						false);
- 	  }
- 	else if ((src->flags & PASTE_LEFT)
- 		 || (src != macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))
-@@ -2023,6 +2061,24 @@ replace_args (cpp_reader *pfile, cpp_has
- 		  paste_flag = tokens_buff_last_token_ptr (buff);
- 		}
- 
-+	      if (vaopt_tracker.stringify ())
-+		{
-+		  unsigned int count
-+		    = start ? paste_flag - start : tokens_buff_count (buff);
-+		  const cpp_token *t
-+		    = stringify_arg (pfile,
-+				     start ? start + 1
-+				     : (const cpp_token **) (buff->base),
-+				     count, true);
-+		  while (count--)
-+		    tokens_buff_remove_last_token (buff);
-+		  if (src->flags & PASTE_LEFT)
-+		    copy_paste_flag (pfile, &t, src);
-+		  tokens_buff_add_token (buff, virt_locs,
-+					 t, t->src_loc, t->src_loc,
-+					 NULL, 0);
-+		  continue;
-+		}
- 	      if (start && paste_flag == start && (*start)->flags & PASTE_LEFT)
- 		/* If __VA_OPT__ expands to nothing (either because __VA_ARGS__
- 		   is empty or because it is __VA_OPT__() ), drop PASTE_LEFT
-@@ -3584,7 +3640,10 @@ create_iso_definition (cpp_reader *pfile
- 	 function-like macros when lexing the subsequent token.  */
-       if (macro->count > 1 && token[-1].type == CPP_HASH && macro->fun_like)
- 	{
--	  if (token->type == CPP_MACRO_ARG)
-+	  if (token->type == CPP_MACRO_ARG
-+	      || (macro->variadic
-+		  && token->type == CPP_NAME
-+		  && token->val.node.node == pfile->spec_nodes.n__VA_OPT__))
- 	    {
- 	      if (token->flags & PREV_WHITE)
- 		token->flags |= SP_PREV_WHITE;
---- gcc/testsuite/c-c++-common/cpp/va-opt-5.c
-+++ gcc/testsuite/c-c++-common/cpp/va-opt-5.c
-@@ -0,0 +1,67 @@
-+/* { dg-do run } */
-+/* { dg-options "-std=gnu99" { target c } } */
-+/* { dg-options "-std=c++20" { target c++ } } */
-+
-+#define lparen (
-+#define a0 fooa0
-+#define a1  fooa1 a0
-+#define a2  fooa2 a1
-+#define a3  fooa3 a2
-+#define a() b lparen )
-+#define b() c lparen )
-+#define c() d lparen )
-+#define g h
-+#define i(j) j
-+#define f(...) #__VA_OPT__(g i(0))
-+#define k(x,...) # __VA_OPT__(x) #x #__VA_OPT__(__VA_ARGS__)
-+#define l(x,...) #__VA_OPT__(a1 x)
-+#define m(x,...) "a()" #__VA_OPT__(a3 __VA_ARGS__ x ## __VA_ARGS__ ## x ## c a3) "a()"
-+#define n(x,...) = #__VA_OPT__(a3 __VA_ARGS__ x ## __VA_ARGS__ ## x ## c a3) #x #__VA_OPT__(a0 __VA_ARGS__ x ## __VA_ARGS__ ## x ## c a0) ;
-+#define o(x, ...) #__VA_OPT__(x##x x##x)
-+#define p(x, ...) #__VA_OPT__(_Pragma ("foobar"))
-+#define q(...) #__VA_OPT__(/* foo */x/* bar */)
-+const char *v1 = f();
-+const char *v2 = f(123);
-+const char *v3 = k(1);
-+const char *v4 = k(1, 2, 3 );
-+const char *v5 = l(a());
-+const char *v6 = l(a1 a(), 1);
-+const char *v7 = m();
-+const char *v8 = m(,);
-+const char *v9 = m(,a3);
-+const char *v10 = m(a3,a(),a0);
-+const char *v11 n()
-+const char *v12 n(,)
-+const char *v13 n(,a0)
-+const char *v14 n(a0, a(),a0)
-+const char *v15 = o(, 0);
-+const char *v16 = p(0);
-+const char *v17 = p(0, 1);
-+const char *v18 = q();
-+const char *v19 = q(1);
-+
-+int
-+main ()
-+{
-+  if (__builtin_strcmp (v1, "")
-+      || __builtin_strcmp (v2, "g i(0)")
-+      || __builtin_strcmp (v3, "1")
-+      || __builtin_strcmp (v4, "112, 3")
-+      || __builtin_strcmp (v5, "")
-+      || __builtin_strcmp (v6, "a1 fooa1 fooa0 b ( )")
-+      || __builtin_strcmp (v7, "a()a()")
-+      || __builtin_strcmp (v8, "a()a()")
-+      || __builtin_strcmp (v9, "a()a3 fooa3 fooa2 fooa1 fooa0 a3c a3a()")
-+      || __builtin_strcmp (v10, "a()a3 b ( ),fooa0 a3a(),a0a3c a3a()")
-+      || __builtin_strcmp (v11, "")
-+      || __builtin_strcmp (v12, "")
-+      || __builtin_strcmp (v13, "a3 fooa0 a0c a3a0 fooa0 a0c a0")
-+      || __builtin_strcmp (v14, "a3 b ( ),fooa0 a0a(),a0a0c a3a0a0 b ( ),fooa0 a0a(),a0a0c a0")
-+      || __builtin_strcmp (v15, "")
-+      || __builtin_strcmp (v16, "")
-+      || __builtin_strcmp (v17, "_Pragma (\"foobar\")")
-+      || __builtin_strcmp (v18, "")
-+      || __builtin_strcmp (v19, "x"))
-+    __builtin_abort ();
-+  return 0;
-+}
---- gcc/testsuite/c-c++-common/cpp/va-opt-6.c
-+++ gcc/testsuite/c-c++-common/cpp/va-opt-6.c
-@@ -0,0 +1,17 @@
-+/* { dg-do preprocess } */
-+/* { dg-options "-std=gnu99" { target c } } */
-+/* { dg-options "-std=c++20" { target c++ } } */
-+
-+#define a ""
-+#define b(...) a ## #__VA_OPT__(1)	/* { dg-error "pasting \"a\" and \"\"\"\" does not give a valid preprocessing token" } */
-+#define c(...) a ## #__VA_OPT__(1)	/* { dg-error "pasting \"a\" and \"\"1\"\" does not give a valid preprocessing token" } */
-+#define d(...) #__VA_OPT__(1) ## !
-+#define e(...) #__VA_OPT__(1) ## !
-+#define f(...) #__VA_OPT__(. ## !)
-+#define g(...) #__VA_OPT__(. ## !)
-+b()
-+c(1)
-+d(   )		/* { dg-error "pasting \"\"\"\" and \"!\" does not give a valid preprocessing token" } */
-+e(  1 )		/* { dg-error "pasting \"\"1\"\" and \"!\" does not give a valid preprocessing token" } */
-+f()
-+g(0)		/* { dg-error "pasting \".\" and \"!\" does not give a valid preprocessing token" } */

SOURCES/gcc11-testsuite-aarch64-add-fno-stack-protector.patch

@@ -1,348 +0,0 @@
-From 3439b79cb7f97464d65316a94d40d49505fb2150 Mon Sep 17 00:00:00 2001
-From: Marek Polacek <polacek@redhat.com>
-Date: Wed, 6 Dec 2023 15:34:24 -0500
-Subject: [PATCH] aarch64: add -fno-stack-protector to tests
-
-These tests fail when the testsuite is executed with -fstack-protector-strong.
-To avoid this, this patch adds -fno-stack-protector to dg-options.
-
----
- gcc/testsuite/gcc.target/aarch64/ldp_stp_unaligned_2.c     | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-12.c          | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-11.c | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-12.c | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-13.c | 4 ++--
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-14.c | 4 ++--
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-15.c | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-2.c  | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-5.c  | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-6.c  | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-8.c  | 2 +-
- gcc/testsuite/gcc.target/aarch64/stack-check-prologue-9.c  | 2 +-
- gcc/testsuite/gcc.target/aarch64/sve/struct_vect_24.c      | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_1.c            | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_10.c           | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_11.c           | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_13.c           | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_15.c           | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_2.c            | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_4.c            | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_6.c            | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_7.c            | 2 +-
- gcc/testsuite/gcc.target/aarch64/test_frame_8.c            | 2 +-
- 30 files changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/gcc/testsuite/gcc.target/aarch64/ldp_stp_unaligned_2.c b/gcc/testsuite/gcc.target/aarch64/ldp_stp_unaligned_2.c
-index 1e46755a39a..50d7d7a2d5d 100644
---- a/gcc/testsuite/gcc.target/aarch64/ldp_stp_unaligned_2.c
-+++ b/gcc/testsuite/gcc.target/aarch64/ldp_stp_unaligned_2.c
-@@ -1,4 +1,4 @@
--/* { dg-options "-O2 -fomit-frame-pointer" } */
-+/* { dg-options "-O2 -fomit-frame-pointer -fno-stack-protector" } */
- 
- /* Check that we split unaligned LDP/STP into base and aligned offset.  */
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-12.c b/gcc/testsuite/gcc.target/aarch64/stack-check-12.c
-index be5a57a9ec6..e1a4c67b041 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-12.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-12.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-asynchronous-unwind-tables -fno-unwind-tables" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- typedef unsigned __attribute__((mode(DI))) uint64_t;
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-11.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-11.c
-index 741f2f5fadc..d57aece05bb 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-11.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-11.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- #define SIZE (6 * 64 * 1024) + (1 * 32 * 1024)
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-12.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-12.c
-index ece68003ade..895d130e4fa 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-12.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-12.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- void
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-13.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-13.c
-index 0fc900c6943..1f1a6c497be 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-13.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-13.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- void h (void) __attribute__ ((noreturn));
-@@ -17,4 +17,4 @@ f (void)
- 
- /* SIZE is more than 1 guard-size, but only one 64KB page is used, expect only 1
-    probe.  Leaf function and omitting leaf pointers, tail call to noreturn which
--   may only omit an epilogue and not a prologue.  Checking for LR saving.  */
-\ No newline at end of file
-+   may only omit an epilogue and not a prologue.  Checking for LR saving.  */
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-14.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-14.c
-index ea733f861e7..facb3cb72a7 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-14.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-14.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- void h (void) __attribute__ ((noreturn));
-@@ -21,4 +21,4 @@ f (void)
-    probe at 1024 and one implicit probe due to LR being saved.  Leaf function
-    and omitting leaf pointers, tail call to noreturn which may only omit an
-    epilogue and not a prologue and control flow in between.  Checking for
--   LR saving.  */
-\ No newline at end of file
-+   LR saving.  */
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-15.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-15.c
-index 63df4a5609a..f2ac60a6214 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-15.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-15.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fomit-frame-pointer -momit-leaf-frame-pointer -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- void g (volatile int *x) ;
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c
-index f0ec1389771..1cf6fbbb085 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c
-@@ -1,4 +1,4 @@
--/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12" } */
-+/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12 -fno-stack-protector" } */
- /* { dg-final { check-function-bodies "**" "" } } */
- 
- void f(int, ...);
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c
-index 6383bec5ebc..2e06346c158 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c
-@@ -1,4 +1,4 @@
--/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12" } */
-+/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12 -fno-stack-protector" } */
- /* { dg-final { check-function-bodies "**" "" } } */
- 
- void f(int, ...);
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-2.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-2.c
-index 61c52a251a7..b37f62cad27 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-2.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-2.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- #define SIZE 2 * 1024
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-5.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-5.c
-index 2ee16350127..34a438671d0 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-5.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-5.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- #define SIZE 64 * 1024
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-6.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-6.c
-index 3c9b606cbe0..a4e34e2fe6a 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-6.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-6.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- #define SIZE 65 * 1024
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-8.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-8.c
-index 333f5fcc360..277dce4c71e 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-8.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-8.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- #define SIZE 128 * 1024
-diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-9.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-9.c
-index a3ff89b5581..a21305541c1 100644
---- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-9.c
-+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-9.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
- 
- #define SIZE 6 * 64 * 1024
-diff --git a/gcc/testsuite/gcc.target/aarch64/sve/struct_vect_24.c b/gcc/testsuite/gcc.target/aarch64/sve/struct_vect_24.c
-index 68a9d5e3d2e..19be6de0c2e 100644
---- a/gcc/testsuite/gcc.target/aarch64/sve/struct_vect_24.c
-+++ b/gcc/testsuite/gcc.target/aarch64/sve/struct_vect_24.c
-@@ -1,6 +1,6 @@
- /* { dg-do compile } */
- /* { dg-require-effective-target supports_stack_clash_protection } */
--/* { dg-options "-O3 -fopenmp-simd -fstack-clash-protection --param stack-clash-protection-guard-size=16" } */
-+/* { dg-options "-O3 -fopenmp-simd -fstack-clash-protection --param stack-clash-protection-guard-size=16 -fno-stack-protector" } */
- 
- #include <stdint.h>
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_1.c b/gcc/testsuite/gcc.target/aarch64/test_frame_1.c
-index f906b073545..c9b8822b4b1 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_1.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_1.c
-@@ -6,7 +6,7 @@
-      * optimized code should use "str !" for stack adjustment.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_10.c b/gcc/testsuite/gcc.target/aarch64/test_frame_10.c
-index c54ab2d0ccb..fe5cbd9ed05 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_10.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_10.c
-@@ -7,7 +7,7 @@
-      * Use a single stack adjustment, no writeback.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_11.c b/gcc/testsuite/gcc.target/aarch64/test_frame_11.c
-index f162cc091e0..11cf471168d 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_11.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_11.c
-@@ -5,7 +5,7 @@
-      * optimized code should use "stp !" for stack adjustment.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 --save-temps" } */
-+/* { dg-options "-O2 --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_13.c b/gcc/testsuite/gcc.target/aarch64/test_frame_13.c
-index 74b3370fa46..ec56963c038 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_13.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_13.c
-@@ -5,7 +5,7 @@
-      * Use a single stack adjustment, no writeback.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 --save-temps" } */
-+/* { dg-options "-O2 --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_15.c b/gcc/testsuite/gcc.target/aarch64/test_frame_15.c
-index bed6714b4fe..4247008de8e 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_15.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_15.c
-@@ -6,7 +6,7 @@
-      * Use a single stack adjustment, no writeback.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 --save-temps" } */
-+/* { dg-options "-O2 --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_2.c b/gcc/testsuite/gcc.target/aarch64/test_frame_2.c
-index 0d715314cb8..9c4243b6480 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_2.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_2.c
-@@ -6,7 +6,7 @@
-      * optimized code should use "stp !" for stack adjustment.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_4.c b/gcc/testsuite/gcc.target/aarch64/test_frame_4.c
-index b41229c42f4..8d0bed93e44 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_4.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_4.c
-@@ -6,7 +6,7 @@
-      * we can use "stp !" to optimize stack adjustment.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_6.c b/gcc/testsuite/gcc.target/aarch64/test_frame_6.c
-index 56259c945d2..2944a8bbe16 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_6.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_6.c
-@@ -6,7 +6,7 @@
-      * use a single stack adjustment, no writeback.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_7.c b/gcc/testsuite/gcc.target/aarch64/test_frame_7.c
-index 5702656a5da..ca371632d81 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_7.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_7.c
-@@ -6,7 +6,7 @@
-      * use a single stack adjustment, no writeback.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-diff --git a/gcc/testsuite/gcc.target/aarch64/test_frame_8.c b/gcc/testsuite/gcc.target/aarch64/test_frame_8.c
-index 75a68b41e08..084e8fac373 100644
---- a/gcc/testsuite/gcc.target/aarch64/test_frame_8.c
-+++ b/gcc/testsuite/gcc.target/aarch64/test_frame_8.c
-@@ -5,7 +5,7 @@
-      * number of callee-saved reg == 1.  */
- 
- /* { dg-do run } */
--/* { dg-options "-O2 -fomit-frame-pointer --save-temps" } */
-+/* { dg-options "-O2 -fomit-frame-pointer --save-temps -fno-stack-protector" } */
- 
- #include "test_frame_common.h"
- 
-
-base-commit: 1bd15d87031e8bf8fe9585fbc166b315303f676c
--- 
-2.43.0
-

SOURCES/gcc11-testsuite-fixes-2.patch

@@ -1,134 +0,0 @@
-commit 74833b3165865a9373506f447720cf20f29c20c8
-Author: Christophe Lyon <christophe.lyon@arm.com>
-Date:   Tue Jan 17 13:10:10 2023 +0000
-
-    aarch64: add -fno-stack-protector to some tests [PR108411]
-    
-    As discussed in the PR, these recently added tests fail when the
-    testsuite is executed with -fstack-protector-strong.  To avoid this,
-    this patch adds -fno-stack-protector to dg-options.
-    
-            PR target/108411
-            gcc/testsuite
-            * g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C: Add
-            -fno-stack-protector.
-            * g++.target/aarch64/bitfield-abi-warning-align16-O2.C: Likewise.
-            * g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C: Likewise.
-            * g++.target/aarch64/bitfield-abi-warning-align32-O2.C: Likewise.
-            * g++.target/aarch64/bitfield-abi-warning-align8-O2.C: Likewise.
-            * gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c: Likewise.
-            * gcc.target/aarch64/bitfield-abi-warning-align16-O2.c: Likewise.
-            * gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c: Likewise.
-            * gcc.target/aarch64/bitfield-abi-warning-align32-O2.c: Likewise.
-            * gcc.target/aarch64/bitfield-abi-warning-align8-O2.c: Likewise.
-
-diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C
-index 443cd458b4c..52f9cdd1ee9 100644
---- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C
-+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
- 
- #define ALIGN 16
- //#define EXTRA
-diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C
-index 76a7e3d0ad4..9ff4e46645b 100644
---- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C
-+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
- 
- #define ALIGN 16
- #define EXTRA
-diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C
-index 6f8f54f41ff..55dcbfe4b7c 100644
---- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C
-+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
- 
- #define ALIGN 32
- //#define EXTRA
-diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C
-index 6b8ad5fbea1..6bb8778ee90 100644
---- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C
-+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
- 
- #define ALIGN 32
- #define EXTRA
-diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C
-index b1764d97ea0..41bcc894a2b 100644
---- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C
-+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
- 
- #define ALIGN 8
- #define EXTRA
-diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c
-index f248a129509..3b2c932ac23 100644
---- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c
-+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
- 
- #define ALIGN 16
- //#define EXTRA
-diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c
-index 22ee5ec4c92..ee5d6faa428 100644
---- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c
-+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
- 
- #define ALIGN 16
- #define EXTRA
-diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c
-index a8a50b35e8e..6d4a883a96e 100644
---- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c
-+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
- 
- #define ALIGN 32
- //#define EXTRA
-diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c
-index e872de3dbe0..331daba354c 100644
---- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c
-+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
- 
- #define ALIGN 32
- #define EXTRA
-diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c
-index cb2a945a819..e6d45f5dd5c 100644
---- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c
-+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -save-temps" } */
-+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
- 
- #define ALIGN 8
- #define EXTRA

SOURCES/gcc11-testsuite-fixes-3.patch

@@ -1,150 +0,0 @@
-commit f1b1d515aa5836844cdb45e8bb2b941784f78fd2
-Author: Jakub Jelinek <jakub@redhat.com>
-Date:   Mon Apr 22 18:00:06 2024 +0200
-
-    libstdc++: Workaround kernel-headers on s390x-linux
-    
-    We see
-    FAIL: 17_intro/headers/c++1998/all_attributes.cc   (test for excess errors)
-    FAIL: 17_intro/headers/c++2011/all_attributes.cc   (test for excess errors)
-    FAIL: 17_intro/headers/c++2014/all_attributes.cc   (test for excess errors)
-    FAIL: 17_intro/headers/c++2017/all_attributes.cc   (test for excess errors)
-    FAIL: 17_intro/headers/c++2020/all_attributes.cc   (test for excess errors)
-    FAIL: 17_intro/names.cc  -std=gnu++17 (test for excess errors)
-    on s390x-linux.
-    The first 5 are due to kernel-headers not using uglified attribute names,
-    where <asm/types.h> contains
-    __attribute__((packed, aligned(4)))
-    I've filed a downstream bugreport for this in
-    https://bugzilla.redhat.com/show_bug.cgi?id=2276084
-    (not really sure where to report kernel-headers issues upstream), while the
-    last one is due to <sys/ucontext.h> from glibc containing:
-      #ifdef __USE_MISC
-      # define __ctx(fld) fld
-      #else
-      # define __ctx(fld) __ ## fld
-      #endif
-      ...
-      typedef union
-        {
-          double  __ctx(d);
-          float   __ctx(f);
-        } fpreg_t;
-    and g++ predefining -D_GNU_SOURCE which implies define __USE_MISC.
-    
-    The following patch adds a workaround for this on the libstdc++ testsuite
-    side.
-    
-    2024-04-22  Jakub Jelinek  <jakub@redhat.com>
-    
-            * testsuite/17_intro/names.cc (d, f): Undefine on s390*-linux*.
-            * testsuite/17_intro/headers/c++1998/all_attributes.cc (packed): Don't
-            define on s390.
-            * testsuite/17_intro/headers/c++2011/all_attributes.cc (packed):
-            Likewise.
-            * testsuite/17_intro/headers/c++2014/all_attributes.cc (packed):
-            Likewise.
-            * testsuite/17_intro/headers/c++2017/all_attributes.cc (packed):
-            Likewise.
-            * testsuite/17_intro/headers/c++2020/all_attributes.cc (packed):
-            Likewise.
-    
-    (cherry picked from commit cf5f7791056b3ed993bc8024be767a86157514a9)
-
-diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc
-index 74268b6a482..658063bd0a4 100644
---- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc
-+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc
-@@ -29,7 +29,11 @@
- # define noreturn 1
- # define visibility 1
- #endif
-+#ifndef __s390__
-+// kernel-headers <asm/types.h> uses __attribute__((packed,aligned(4))) on
-+// S390.
- #define packed 1
-+#endif
- #define pure 1
- // glibc's sysdeps/unix/sysv/linux/arm/sys/ucontext.h uses this on ARM.
- #ifndef __arm__
-diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc
-index 5d0c5fe8177..f1bcc1fbbc8 100644
---- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc
-+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc
-@@ -29,7 +29,11 @@
- # define visibility 1
- #endif
- #define no_unique_address 1
-+#ifndef __s390__
-+// kernel-headers <asm/types.h> uses __attribute__((packed,aligned(4))) on
-+// S390.
- #define packed 1
-+#endif
- #define pure 1
- // glibc's sysdeps/unix/sysv/linux/arm/sys/ucontext.h uses this on ARM.
- #ifndef __arm__
-diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc
-index 3cac2190ec7..48e7ef64afb 100644
---- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc
-+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc
-@@ -29,7 +29,11 @@
- # define visibility 1
- #endif
- #define no_unique_address 1
-+#ifndef __s390__
-+// kernel-headers <asm/types.h> uses __attribute__((packed,aligned(4))) on
-+// S390.
- #define packed 1
-+#endif
- #define pure 1
- // glibc's sysdeps/unix/sysv/linux/arm/sys/ucontext.h uses this on ARM.
- #ifndef __arm__
-diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc
-index f607532aa90..03e4e23c686 100644
---- a/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc
-+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc
-@@ -28,7 +28,11 @@
- # define visibility 1
- #endif
- #define no_unique_address 1
-+#ifndef __s390__
-+// kernel-headers <asm/types.h> uses __attribute__((packed,aligned(4))) on
-+// S390.
- #define packed 1
-+#endif
- #define pure 1
- // glibc's sysdeps/unix/sysv/linux/arm/sys/ucontext.h uses this on ARM.
- #ifndef __arm__
-diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc
-index 5732633c7e4..7375dc88bb1 100644
---- a/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc
-+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc
-@@ -27,7 +27,11 @@
- # define cold 1
- # define visibility 1
- #endif
-+#ifndef __s390__
-+// kernel-headers <asm/types.h> uses __attribute__((packed,aligned(4))) on
-+// S390.
- #define packed 1
-+#endif
- #define pure 1
- // glibc's sysdeps/unix/sysv/linux/arm/sys/ucontext.h uses this on ARM.
- #ifndef __arm__
-diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
-index eb4d064177c..864bc20f146 100644
---- a/libstdc++-v3/testsuite/17_intro/names.cc
-+++ b/libstdc++-v3/testsuite/17_intro/names.cc
-@@ -267,6 +267,12 @@
- #undef u
- #endif
- 
-+#if defined (__linux__) && defined (__s390__)
-+// <sys/ucontext.h> defines fpreg_t::d and fpreg_t::f
-+#undef d
-+#undef f
-+#endif
-+
- #if defined (__linux__) && defined (__sparc__)
- #undef y
- #endif

SOURCES/gcc11-testsuite-fixes.patch

@@ -1,22 +0,0 @@
-diff --git a/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc b/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
-index b0277b3f4d1..425daff317a 100644
---- a/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
-+++ b/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
-@@ -53,3 +53,6 @@ test01()
- // { dg-prune-output "does not have integral type" }
- // { dg-prune-output "non-integral type" }
- // { dg-prune-output "invalid specialization" }
-+// These show up with -Wp,-D_GLIBCXX_ASSERTIONS.
-+// { dg-prune-output "invalid operands" }
-+// { dg-prune-output "wrong type argument" }
-diff --git a/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc b/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
-index 8cabfe2ea2f..a14d373c461 100644
---- a/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
-+++ b/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
-@@ -53,3 +53,6 @@ test01()
- // { dg-prune-output "does not have integral type" }
- // { dg-prune-output "non-integral type" }
- // { dg-prune-output "invalid specialization" }
-+// These show up with -Wp,-D_GLIBCXX_ASSERTIONS.
-+// { dg-prune-output "invalid operands" }
-+// { dg-prune-output "wrong type argument" }

SOURCES/gcc8-RHEL-32886.patch

@@ -0,0 +1,59 @@
+2024-04-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* tree-vect-stmts.c (vectorizable_call): For j == 0 use
+	vargs.safe_grow (nargs) rather than vargs.create (nargs), for j != 0
+	remove vargs.truncate (0).  Instead of vargs.quick_push store into
+	vargs[i].  Use vargs[i] instead of gimple_call_arg (new_stmt, i)
+	if j != 0.
+
+	* gcc.c-torture/compile/20240418.c: New test.
+
+--- gcc/tree-vect-stmts.c.jj	2021-04-22 15:48:48.228178359 +0200
++++ gcc/tree-vect-stmts.c	2024-04-18 13:21:46.104061529 +0200
+@@ -3242,9 +3242,7 @@ vectorizable_call (gimple *gs, gimple_st
+ 	{
+ 	  /* Build argument list for the vectorized call.  */
+ 	  if (j == 0)
+-	    vargs.create (nargs);
+-	  else
+-	    vargs.truncate (0);
++	    vargs.safe_grow (nargs);
+ 
+ 	  if (slp_node)
+ 	    {
+@@ -3252,7 +3250,7 @@ vectorizable_call (gimple *gs, gimple_st
+ 	      vec<tree> vec_oprnds0;
+ 
+ 	      for (i = 0; i < nargs; i++)
+-		vargs.quick_push (gimple_call_arg (stmt, i));
++		vargs[i] = gimple_call_arg (stmt, i);
+ 	      vect_get_slp_defs (vargs, slp_node, &vec_defs);
+ 	      vec_oprnds0 = vec_defs[0];
+ 
+@@ -3314,13 +3312,10 @@ vectorizable_call (gimple *gs, gimple_st
+ 		vec_oprnd0
+ 		  = vect_get_vec_def_for_operand (op, stmt);
+ 	      else
+-		{
+-		  vec_oprnd0 = gimple_call_arg (new_stmt, i);
+-		  vec_oprnd0
+-                    = vect_get_vec_def_for_stmt_copy (dt[i], vec_oprnd0);
+-		}
++		vec_oprnd0
++		  = vect_get_vec_def_for_stmt_copy (dt[i], vargs[i]);
+ 
+-	      vargs.quick_push (vec_oprnd0);
++	      vargs[i] = vec_oprnd0;
+ 	    }
+ 
+ 	  if (gimple_call_internal_p (stmt)
+--- gcc/testsuite/gcc.c-torture/compile/20240418.c.jj	2024-04-18 13:24:10.180065661 +0200
++++ gcc/testsuite/gcc.c-torture/compile/20240418.c	2024-04-18 13:19:12.166194018 +0200
+@@ -0,0 +1,7 @@
++void
++foo (signed char *p, unsigned long long *q)
++{
++  int i;
++  for (i = 0; i <= 64; i++)
++    *p++ = __builtin_popcountll (*q++);
++}

SOURCES/gcc8-Wbidi-chars.patch

@@ -96,10 +96,10 @@ Date:   Wed Oct 6 14:33:59 2021 -0400
             * c-c++-common/Wbidi-chars-17.c: New test.
 
 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index 8a4cd634f77..3976fc368db 100644
+index f591b39be5a..cf922812198 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -374,6 +374,30 @@ Wbad-function-cast
+@@ -334,6 +334,30 @@ Wbad-function-cast
  C ObjC Var(warn_bad_function_cast) Warning
  Warn about casting functions to incompatible types.
  
@@ -131,23 +131,22 @@ index 8a4cd634f77..3976fc368db 100644
  C ObjC C++ ObjC++ Var(warn_bool_compare) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall)
  Warn about boolean expression compared with an integer value different from true/false.
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6070288856c..a22758d18ee 100644
+index 78ca7738df2..cc85c53aede 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -325,7 +325,9 @@ Objective-C and Objective-C++ Dialects}.
+@@ -264,7 +264,8 @@ Objective-C and Objective-C++ Dialects}.
- -Warith-conversion @gol
+ -Walloc-zero  -Walloc-size-larger-than=@var{n}
- -Warray-bounds  -Warray-bounds=@var{n} @gol
+ -Walloca  -Walloca-larger-than=@var{n} @gol
- -Wno-attributes  -Wattribute-alias=@var{n} -Wno-attribute-alias @gol
+ -Wno-aggressive-loop-optimizations  -Warray-bounds  -Warray-bounds=@var{n} @gol
---Wno-attribute-warning  -Wbool-compare  -Wbool-operation @gol
+--Wno-attributes  -Wbool-compare  -Wbool-operation @gol
-+-Wno-attribute-warning  @gol
++-Wno-attributes  -Wbidi-chars=@r{[}none@r{|}unpaired@r{|}any@r{]} @gol 
-+-Wbidi-chars=@r{[}none@r{|}unpaired@r{|}any@r{]} @gol
 +-Wbool-compare  -Wbool-operation @gol
  -Wno-builtin-declaration-mismatch @gol
  -Wno-builtin-macro-redefined  -Wc90-c99-compat  -Wc99-c11-compat @gol
- -Wc11-c2x-compat @gol
+ -Wc++-compat  -Wc++11-compat  -Wc++14-compat  @gol
-@@ -7557,6 +7559,23 @@ Attributes considered include @code{alloc_align}, @code{alloc_size},
+@@ -5606,6 +5607,23 @@ Warn about declarations using the @code{alias} and similar attributes whose
- This is the default.  You can disable these warnings with either
+ target is incompatible with the type of the alias.  @xref{Function Attributes,
- @option{-Wno-attribute-alias} or @option{-Wattribute-alias=0}.
+ ,Declaring Attributes of Functions}.
  
 +@item -Wbidi-chars=@r{[}none@r{|}unpaired@r{|}any@r{]}
 +@opindex Wbidi-chars=
@@ -222,19 +221,15 @@ index 00000000000..3f851b69e65
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-11.c b/gcc/testsuite/c-c++-common/Wbidi-chars-11.c
 new file mode 100644
-index 00000000000..270ce2368a9
+index 00000000000..44d044d82de
 --- /dev/null
 +++ b/gcc/testsuite/c-c++-common/Wbidi-chars-11.c
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,9 @@
 +/* PR preprocessor/103026 */
 +/* { dg-do compile } */
 +/* { dg-options "-Wbidi-chars=unpaired" } */
 +/* Test that we warn when mixing UCN and UTF-8.  */
 +
-+int LRE_‪_PDF_\u202c;
-+/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
-+int LRE_\u202a_PDF_‬_;
-+/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
 +const char *s1 = "LRE_‪_PDF_\u202c";
 +/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
 +const char *s2 = "LRE_\u202a_PDF_‬";
@@ -498,10 +493,10 @@ index 00000000000..9dc7edb6e64
 +}
 diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-4.c b/gcc/testsuite/c-c++-common/Wbidi-chars-4.c
 new file mode 100644
-index 00000000000..639e5c62e88
+index 00000000000..49f856b9bfe
 --- /dev/null
 +++ b/gcc/testsuite/c-c++-common/Wbidi-chars-4.c
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,172 @@
 +/* PR preprocessor/103026 */
 +/* { dg-do compile } */
 +/* { dg-options "-Wbidi-chars=any -Wno-multichar -Wno-overflow" } */
@@ -645,22 +640,6 @@ index 00000000000..639e5c62e88
 +/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
 +}
 +
-+int a‪b‬c;
-+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
-+int a‫b‬c;
-+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
-+int a‭b‬c;
-+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
-+int a‮b‬c;
-+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
-+int a⁦b⁩c;
-+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
-+int a⁧b⁩c;
-+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
-+int a⁨b⁩c;
-+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
-+int A‬X;
-+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
 +int A\u202cY;
 +/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
 +int A\u202CY2;
@@ -692,10 +671,10 @@ index 00000000000..639e5c62e88
 +/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
 diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-5.c b/gcc/testsuite/c-c++-common/Wbidi-chars-5.c
 new file mode 100644
-index 00000000000..68cb053144b
+index 00000000000..f5776806c79
 --- /dev/null
 +++ b/gcc/testsuite/c-c++-common/Wbidi-chars-5.c
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,172 @@
 +/* PR preprocessor/103026 */
 +/* { dg-do compile } */
 +/* { dg-options "-Wbidi-chars=unpaired -Wno-multichar -Wno-overflow" } */
@@ -839,22 +818,6 @@ index 00000000000..68cb053144b
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +}
 +
-+int a‪b‬c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int a‫b‬c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int a‭b‬c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int a‮b‬c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int a⁦b⁩c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int a⁧b⁩c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int a⁨b⁩c;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
-+int A‬X;
-+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
 +int A\u202cY;
 +/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
 +int A\u202CY2;
@@ -886,10 +849,10 @@ index 00000000000..68cb053144b
 +/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
 diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-6.c b/gcc/testsuite/c-c++-common/Wbidi-chars-6.c
 new file mode 100644
-index 00000000000..0ce6fff2dee
+index 00000000000..a65d6faf60e
 --- /dev/null
 +++ b/gcc/testsuite/c-c++-common/Wbidi-chars-6.c
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,130 @@
 +/* PR preprocessor/103026 */
 +/* { dg-do compile } */
 +/* { dg-options "-Wbidi-chars=unpaired" } */
@@ -1000,49 +963,24 @@ index 00000000000..0ce6fff2dee
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +}
 +
-+int aLRE‪bPDI⁩;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int A\u202aB\u2069C;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aRLE‫bPDI⁩;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int a\u202bB\u2069c;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aLRO‭bPDI⁩;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int a\u202db\u2069c2;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aRLO‮bPDI⁩;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int a\u202eb\u2069;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aLRI⁦bPDF‬;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int a\u2066b\u202c;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aRLI⁧bPDF‬c
-+;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
 +int a\u2067b\u202c;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aFSI⁨bPDF‬;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int a\u2068b\u202c;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aFSI⁨bPD\u202C;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aFSI\u2068bPDF‬_;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
-+int aLRE‪bPDF‬b; 
 +int A\u202aB\u202c;
-+int a_LRE‪_LRE‪_b_PDF‬_PDF‬;
 +int A\u202aA\u202aB\u202cB\u202c;
-+int aPDF‬bLREadPDF‬;
 +int a_\u202C_\u202a_\u202c;
-+int a_LRE‪_b_PDF‬_c_LRE‪_PDF‬;
 +int a_\u202a_\u202c_\u202a_\u202c_;
-+int a_LRE‪_b_PDF‬_c_LRE‪;
-+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 +int a_\u202a_\u202c_\u202a_;
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-7.c b/gcc/testsuite/c-c++-common/Wbidi-chars-7.c
@@ -1115,11 +1053,11 @@ index 00000000000..e2af1b1ca97
 +int lre_\u202a; const char *s4 = "PDF\u202c";
 +/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
 diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
-index 176f8c5bbce..112b9c24751 100644
+index 3ad52d5e01e..e0dcb7f0529 100644
 --- a/libcpp/include/cpplib.h
 +++ b/libcpp/include/cpplib.h
-@@ -319,6 +319,17 @@ enum cpp_main_search
+@@ -305,6 +305,17 @@ enum cpp_normalize_level {
-   CMS_system,  /* Search the system INCLUDE path.  */
+   normalized_none
  };
  
 +/* The possible bidirectional control characters checking levels, from least
@@ -1136,7 +1074,7 @@ index 176f8c5bbce..112b9c24751 100644
  /* This structure is nested inside struct cpp_reader, and
     carries all the options visible to the command line.  */
  struct cpp_options
-@@ -539,6 +550,10 @@ struct cpp_options
+@@ -506,6 +517,10 @@ struct cpp_options
    /* True if warn about differences between C++98 and C++11.  */
    bool cpp_warn_cxx11_compat;
  
@@ -1147,21 +1085,21 @@ index 176f8c5bbce..112b9c24751 100644
    /* Dependency generation.  */
    struct
    {
-@@ -643,7 +658,8 @@ enum cpp_warning_reason {
+@@ -1063,7 +1078,8 @@ enum {
+   CPP_W_PEDANTIC,
    CPP_W_C90_C99_COMPAT,
-   CPP_W_C11_C2X_COMPAT,
    CPP_W_CXX11_COMPAT,
 -  CPP_W_EXPANSION_TO_DEFINED
 +  CPP_W_EXPANSION_TO_DEFINED,
 +  CPP_W_BIDIRECTIONAL
  };
  
- /* Callback for header lookup for HEADER, which is the name of a
+ /* Output a diagnostic of some kind.  */
 diff --git a/libcpp/init.c b/libcpp/init.c
-index 5a424e23553..f9a8f5f088f 100644
+index ca3fbaa5c05..5c15da82ff8 100644
 --- a/libcpp/init.c
 +++ b/libcpp/init.c
-@@ -223,6 +223,7 @@ cpp_create_reader (enum c_lang lang, cpp_hash_table *table,
+@@ -208,6 +208,7 @@ cpp_create_reader (enum c_lang lang, cpp_hash_table *table,
        = ENABLE_CANONICAL_SYSTEM_HEADERS;
    CPP_OPTION (pfile, ext_numeric_literals) = 1;
    CPP_OPTION (pfile, warn_date_time) = 0;
@@ -1170,13 +1108,13 @@ index 5a424e23553..f9a8f5f088f 100644
    /* Default CPP arithmetic to something sensible for the host for the
       benefit of dumb users like fix-header.  */
 diff --git a/libcpp/internal.h b/libcpp/internal.h
-index 8577cab6c83..0ce0246c5a2 100644
+index 4f74f995cec..53b4c0f4af7 100644
 --- a/libcpp/internal.h
 +++ b/libcpp/internal.h
-@@ -597,6 +597,13 @@ struct cpp_reader
+@@ -576,6 +576,13 @@ struct cpp_reader
-   /* Location identifying the main source file -- intended to be line
+   /* If non-null, the lexer will use this location for the next token
-      zero of said file.  */
+      instead of getting a location from the linemap.  */
-   location_t main_loc;
+   source_location *forced_token_location_p;
 +
 +  /* Returns true iff we should warn about UTF-8 bidirectional control
 +     characters.  */
@@ -1188,7 +1126,7 @@ index 8577cab6c83..0ce0246c5a2 100644
  
  /* Character classes.  Based on the more primitive macros in safe-ctype.h.
 diff --git a/libcpp/lex.c b/libcpp/lex.c
-index fa2253d41c3..6a4fbce6030 100644
+index a408f912c5c..ea7f75e842e 100644
 --- a/libcpp/lex.c
 +++ b/libcpp/lex.c
 @@ -1164,6 +1164,324 @@ _cpp_process_line_notes (cpp_reader *pfile, int in_comment)
@@ -1196,12 +1134,12 @@ index fa2253d41c3..6a4fbce6030 100644
  }
  
 +namespace bidi {
-+  enum class kind {
++  enum kind {
 +    NONE, LRE, RLE, LRO, RLO, LRI, RLI, FSI, PDF, PDI, LTR, RTL
 +  };
 +
 +  /* All the UTF-8 encodings of bidi characters start with E2.  */
-+  constexpr uchar utf8_start = 0xe2;
++  const uchar utf8_start = 0xe2;
 +
 +  /* A vector holding currently open bidi contexts.  We use a char for
 +     each context, its LSB is 1 if it represents a PDF context, 0 if it
@@ -1227,7 +1165,7 @@ index fa2253d41c3..6a4fbce6030 100644
 +  /* Return the context of the Ith element.  */
 +  kind ctx_at (unsigned int i)
 +  {
-+    return (vec[i] & 1) ? kind::PDF : kind::PDI;
++    return (vec[i] & 1) ? PDF : PDI;
 +  }
 +
 +  /* Return which context is currently opened.  */
@@ -1235,7 +1173,7 @@ index fa2253d41c3..6a4fbce6030 100644
 +  {
 +    unsigned int len = vec.count ();
 +    if (len == 0)
-+      return kind::NONE;
++      return NONE;
 +    return ctx_at (len - 1);
 +  }
 +
@@ -1253,40 +1191,40 @@ index fa2253d41c3..6a4fbce6030 100644
 +  {
 +    switch (k)
 +      {
-+      case kind::LRE:
++      case LRE:
-+      case kind::RLE:
++      case RLE:
-+      case kind::LRO:
++      case LRO:
-+      case kind::RLO:
++      case RLO:
 +	vec.push (ucn_p ? 3u : 1u);
 +	break;
-+      case kind::LRI:
++      case LRI:
-+      case kind::RLI:
++      case RLI:
-+      case kind::FSI:
++      case FSI:
 +	vec.push (ucn_p ? 2u : 0u);
 +	break;
 +      /* PDF terminates the scope of the last LRE, RLE, LRO, or RLO
 +	 whose scope has not yet been terminated.  */
-+      case kind::PDF:
++      case PDF:
-+	if (current_ctx () == kind::PDF)
++	if (current_ctx () == PDF)
 +	  pop ();
 +	break;
 +      /* PDI terminates the scope of the last LRI, RLI, or FSI whose
 +	 scope has not yet been terminated, as well as the scopes of
 +	 any subsequent LREs, RLEs, LROs, or RLOs whose scopes have not
 +	 yet been terminated.  */
-+      case kind::PDI:
++      case PDI:
 +	for (int i = vec.count () - 1; i >= 0; --i)
-+	  if (ctx_at (i) == kind::PDI)
++	  if (ctx_at (i) == PDI)
 +	    {
 +	      vec.truncate (i);
 +	      break;
 +	    }
 +	break;
-+      case kind::LTR:
++      case LTR:
-+      case kind::RTL:
++      case RTL:
 +	/* These aren't popped by a PDF/PDI.  */
 +	break;
-+      [[likely]] case kind::NONE:
++      [[likely]] case NONE:
 +	break;
 +      default:
 +	abort ();
@@ -1298,27 +1236,27 @@ index fa2253d41c3..6a4fbce6030 100644
 +  {
 +    switch (k)
 +      {
-+      case kind::LRE:
++      case LRE:
 +	return "U+202A (LEFT-TO-RIGHT EMBEDDING)";
-+      case kind::RLE:
++      case RLE:
 +	return "U+202B (RIGHT-TO-LEFT EMBEDDING)";
-+      case kind::LRO:
++      case LRO:
 +	return "U+202D (LEFT-TO-RIGHT OVERRIDE)";
-+      case kind::RLO:
++      case RLO:
 +	return "U+202E (RIGHT-TO-LEFT OVERRIDE)";
-+      case kind::LRI:
++      case LRI:
 +	return "U+2066 (LEFT-TO-RIGHT ISOLATE)";
-+      case kind::RLI:
++      case RLI:
 +	return "U+2067 (RIGHT-TO-LEFT ISOLATE)";
-+      case kind::FSI:
++      case FSI:
 +	return "U+2068 (FIRST STRONG ISOLATE)";
-+      case kind::PDF:
++      case PDF:
 +	return "U+202C (POP DIRECTIONAL FORMATTING)";
-+      case kind::PDI:
++      case PDI:
 +	return "U+2069 (POP DIRECTIONAL ISOLATE)";
-+      case kind::LTR:
++      case LTR:
 +	return "U+200E (LEFT-TO-RIGHT MARK)";
-+      case kind::RTL:
++      case RTL:
 +	return "U+200F (RIGHT-TO-LEFT MARK)";
 +      default:
 +	abort ();
@@ -1337,19 +1275,19 @@ index fa2253d41c3..6a4fbce6030 100644
 +    switch (p[2])
 +      {
 +      case 0xaa:
-+	return bidi::kind::LRE;
++	return bidi::LRE;
 +      case 0xab:
-+	return bidi::kind::RLE;
++	return bidi::RLE;
 +      case 0xac:
-+	return bidi::kind::PDF;
++	return bidi::PDF;
 +      case 0xad:
-+	return bidi::kind::LRO;
++	return bidi::LRO;
 +      case 0xae:
-+	return bidi::kind::RLO;
++	return bidi::RLO;
 +      case 0x8e:
-+	return bidi::kind::LTR;
++	return bidi::LTR;
 +      case 0x8f:
-+	return bidi::kind::RTL;
++	return bidi::RTL;
 +      default:
 +	break;
 +      }
@@ -1357,18 +1295,18 @@ index fa2253d41c3..6a4fbce6030 100644
 +    switch (p[2])
 +      {
 +      case 0xa6:
-+	return bidi::kind::LRI;
++	return bidi::LRI;
 +      case 0xa7:
-+	return bidi::kind::RLI;
++	return bidi::RLI;
 +      case 0xa8:
-+	return bidi::kind::FSI;
++	return bidi::FSI;
 +      case 0xa9:
-+	return bidi::kind::PDI;
++	return bidi::PDI;
 +      default:
 +	break;
 +      }
 +
-+  return bidi::kind::NONE;
++  return bidi::NONE;
 +}
 +
 +/* Parse a UCN where P points just past \u or \U and return its bidi code.  */
@@ -1384,32 +1322,32 @@ index fa2253d41c3..6a4fbce6030 100644
 +  if (is_U)
 +    {
 +      if (p[0] != '0' || p[1] != '0' || p[2] != '0' || p[3] != '0')
-+	return bidi::kind::NONE;
++	return bidi::NONE;
 +      /* Skip 4B so we can treat \u and \U the same below.  */
 +      p += 4;
 +    }
 +
 +  /* All code points we are looking for start with 20xx.  */
 +  if (p[0] != '2' || p[1] != '0')
-+    return bidi::kind::NONE;
++    return bidi::NONE;
 +  else if (p[2] == '2')
 +    switch (p[3])
 +      {
 +      case 'a':
 +      case 'A':
-+	return bidi::kind::LRE;
++	return bidi::LRE;
 +      case 'b':
 +      case 'B':
-+	return bidi::kind::RLE;
++	return bidi::RLE;
 +      case 'c':
 +      case 'C':
-+	return bidi::kind::PDF;
++	return bidi::PDF;
 +      case 'd':
 +      case 'D':
-+	return bidi::kind::LRO;
++	return bidi::LRO;
 +      case 'e':
 +      case 'E':
-+	return bidi::kind::RLO;
++	return bidi::RLO;
 +      default:
 +	break;
 +      }
@@ -1417,13 +1355,13 @@ index fa2253d41c3..6a4fbce6030 100644
 +    switch (p[3])
 +      {
 +      case '6':
-+	return bidi::kind::LRI;
++	return bidi::LRI;
 +      case '7':
-+	return bidi::kind::RLI;
++	return bidi::RLI;
 +      case '8':
-+	return bidi::kind::FSI;
++	return bidi::FSI;
 +      case '9':
-+	return bidi::kind::PDI;
++	return bidi::PDI;
 +      default:
 +	break;
 +      }
@@ -1432,15 +1370,15 @@ index fa2253d41c3..6a4fbce6030 100644
 +      {
 +      case 'e':
 +      case 'E':
-+	return bidi::kind::LTR;
++	return bidi::LTR;
 +      case 'f':
 +      case 'F':
-+	return bidi::kind::RTL;
++	return bidi::RTL;
 +      default:
 +	break;
 +      }
 +
-+  return bidi::kind::NONE;
++  return bidi::NONE;
 +}
 +
 +/* We're closing a bidi context, that is, we've encountered a newline,
@@ -1455,7 +1393,7 @@ index fa2253d41c3..6a4fbce6030 100644
 +  if (CPP_OPTION (pfile, cpp_warn_bidirectional) == bidirectional_unpaired
 +      && bidi::vec.count () > 0)
 +    {
-+      const location_t loc
++      const source_location loc
 +	= linemap_position_for_column (pfile->line_table,
 +				       CPP_BUF_COLUMN (pfile->buffer, p));
 +      cpp_warning_with_line (pfile, CPP_W_BIDIRECTIONAL, loc, 0,
@@ -1475,14 +1413,14 @@ index fa2253d41c3..6a4fbce6030 100644
 +maybe_warn_bidi_on_char (cpp_reader *pfile, const uchar *p, bidi::kind kind,
 +			 bool ucn_p)
 +{
-+  if (__builtin_expect (kind == bidi::kind::NONE, 1))
++  if (__builtin_expect (kind == bidi::NONE, 1))
 +    return;
 +
-+  const auto warn_bidi = CPP_OPTION (pfile, cpp_warn_bidirectional);
++  const unsigned char warn_bidi = CPP_OPTION (pfile, cpp_warn_bidirectional);
 +
 +  if (warn_bidi != bidirectional_none)
 +    {
-+      const location_t loc
++      const source_location loc
 +	= linemap_position_for_column (pfile->line_table,
 +				       CPP_BUF_COLUMN (pfile->buffer, p));
 +      /* It seems excessive to warn about a PDI/PDF that is closing
@@ -1499,7 +1437,7 @@ index fa2253d41c3..6a4fbce6030 100644
 +	}
 +      else if (warn_bidi == bidirectional_any)
 +	{
-+	  if (kind == bidi::kind::PDF || kind == bidi::kind::PDI)
++	  if (kind == bidi::PDF || kind == bidi::PDI)
 +	    cpp_warning_with_line (pfile, CPP_W_BIDIRECTIONAL, loc, 0,
 +				   "\"%s\" is closing an unopened context",
 +				   bidi::to_str (kind));
@@ -1563,7 +1501,7 @@ index fa2253d41c3..6a4fbce6030 100644
 @@ -1233,9 +1565,31 @@ skip_line_comment (cpp_reader *pfile)
  {
    cpp_buffer *buffer = pfile->buffer;
-   location_t orig_line = pfile->line_table->highest_line;
+   source_location orig_line = pfile->line_table->highest_line;
 +  const bool warn_bidi_p = pfile->warn_bidi_p ();
  
 -  while (*buffer->cur != '\n')
@@ -1594,9 +1532,9 @@ index fa2253d41c3..6a4fbce6030 100644
  
    _cpp_process_line_notes (pfile, true);
    return orig_line != pfile->line_table->highest_line;
-@@ -1346,11 +1700,13 @@ static const cppchar_t utf8_signifier = 0xC0;
+@@ -1315,11 +1669,13 @@ warn_about_normalization (cpp_reader *pfile,
  
- /* Returns TRUE if the sequence starting at buffer->cur is valid in
+ /* Returns TRUE if the sequence starting at buffer->cur is invalid in
     an identifier.  FIRST is TRUE if this starts an identifier.  */
 +
  static bool
@@ -1608,35 +1546,20 @@ index fa2253d41c3..6a4fbce6030 100644
  
    if (*buffer->cur == '$')
      {
-@@ -1373,6 +1729,13 @@ forms_identifier_p (cpp_reader *pfile, int first,
+@@ -1343,6 +1699,12 @@ forms_identifier_p (cpp_reader *pfile, int first,
+     {
        cppchar_t s;
-       if (*buffer->cur >= utf8_signifier)
- 	{
-+	  if (__builtin_expect (*buffer->cur == bidi::utf8_start, 0)
-+	      && warn_bidi_p)
-+	    {
-+	      bidi::kind kind = get_bidi_utf8 (buffer->cur);
-+	      maybe_warn_bidi_on_char (pfile, buffer->cur, kind,
-+				       /*ucn_p=*/false);
-+	    }
- 	  if (_cpp_valid_utf8 (pfile, &buffer->cur, buffer->rlimit, 1 + !first,
- 			       state, &s))
- 	    return true;
-@@ -1381,6 +1744,13 @@ forms_identifier_p (cpp_reader *pfile, int first,
- 	       && (buffer->cur[1] == 'u' || buffer->cur[1] == 'U'))
- 	{
        buffer->cur += 2;
 +      if (warn_bidi_p)
 +	{
 +	  bidi::kind kind = get_bidi_ucn (buffer->cur,
 +					  buffer->cur[-1] == 'U');
-+	      maybe_warn_bidi_on_char (pfile, buffer->cur, kind,
++	  maybe_warn_bidi_on_char (pfile, buffer->cur, kind, /*ucn_p=*/true);
-+				       /*ucn_p=*/true);
 +	}
        if (_cpp_valid_ucn (pfile, &buffer->cur, buffer->rlimit, 1 + !first,
  			  state, &s, NULL, NULL))
  	return true;
-@@ -1489,6 +1859,7 @@ lex_identifier (cpp_reader *pfile, const uchar *base, bool starts_ucn,
+@@ -1450,6 +1812,7 @@ lex_identifier (cpp_reader *pfile, const uchar *base, bool starts_ucn,
    const uchar *cur;
    unsigned int len;
    unsigned int hash = HT_HASHSTEP (0, *base);
@@ -1644,7 +1567,7 @@ index fa2253d41c3..6a4fbce6030 100644
  
    cur = pfile->buffer->cur;
    if (! starts_ucn)
-@@ -1512,6 +1883,8 @@ lex_identifier (cpp_reader *pfile, const uchar *base, bool starts_ucn,
+@@ -1472,6 +1835,8 @@ lex_identifier (cpp_reader *pfile, const uchar *base, bool starts_ucn,
  	    pfile->buffer->cur++;
  	  }
        } while (forms_identifier_p (pfile, false, nst));
@@ -1653,31 +1576,31 @@ index fa2253d41c3..6a4fbce6030 100644
        result = _cpp_interpret_identifier (pfile, base,
  					  pfile->buffer->cur - base);
        *spelling = cpp_lookup (pfile, base, pfile->buffer->cur - base);
-@@ -1758,6 +2131,7 @@ static void
+@@ -1673,6 +2038,7 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
- lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
+   _cpp_buff *first_buff = NULL, *last_buff = NULL;
- {
+   size_t raw_prefix_start;
-   const uchar *pos = base;
+   _cpp_line_note *note = &pfile->buffer->notes[pfile->buffer->cur_note];
 +  const bool warn_bidi_p = pfile->warn_bidi_p ();
  
-   /* 'tis a pity this information isn't passed down from the lexer's
+   type = (*base == 'L' ? CPP_WSTRING :
-      initial categorization of the token.  */
+ 	  *base == 'U' ? CPP_STRING32 :
-@@ -1994,8 +2368,15 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
+@@ -1909,8 +2275,15 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
- 	  pos = base = pfile->buffer->cur;
+ 	  cur = base = pfile->buffer->cur;
  	  note = &pfile->buffer->notes[pfile->buffer->cur_note];
  	}
 +      else if (__builtin_expect ((unsigned char) c == bidi::utf8_start, 0)
 +	       && warn_bidi_p)
-+	maybe_warn_bidi_on_char (pfile, pos - 1, get_bidi_utf8 (pos - 1),
++	maybe_warn_bidi_on_char (pfile, cur - 1, get_bidi_utf8 (cur - 1),
 +				 /*ucn_p=*/false);
      }
  
 +  if (warn_bidi_p)
-+    maybe_warn_bidi_on_close (pfile, pos);
++    maybe_warn_bidi_on_close (pfile, cur);
 +
    if (CPP_OPTION (pfile, user_literals))
      {
        /* If a string format macro, say from inttypes.h, is placed touching
-@@ -2090,15 +2471,27 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
+@@ -2005,15 +2378,27 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
    else
      terminator = '>', type = CPP_HEADER_NAME;
  
@@ -1707,7 +1630,7 @@ index fa2253d41c3..6a4fbce6030 100644
        else if (c == '\n')
  	{
  	  cur--;
-@@ -2115,6 +2508,11 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
+@@ -2030,6 +2415,11 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
  	}
        else if (c == '\0')
  	saw_NUL = true;

SOURCES/gcc8-Wno-format-security.patch

@@ -5,7 +5,7 @@
 
 --- gcc/configure.ac.jj	2017-02-13 12:20:53.000000000 +0100
 +++ gcc/configure.ac	2017-02-25 12:42:32.859175403 +0100
-@@ -480,7 +480,7 @@ AC_ARG_ENABLE(build-format-warnings,
+@@ -481,7 +481,7 @@ AC_ARG_ENABLE(build-format-warnings,
    AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
    [],[enable_build_format_warnings=yes])
  AS_IF([test $enable_build_format_warnings = no],
@@ -13,7 +13,7 @@
 +      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
  ACX_PROG_CXX_WARNING_OPTS(
  	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
- 		       [-Wcast-qual -Wno-error=format-diag $wf_opt])),
+ 		       [-Wcast-qual $wf_opt])), [loose_warn])
 --- gcc/configure.jj	2017-02-13 12:20:52.000000000 +0100
 +++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
 @@ -6647,7 +6647,7 @@ else

SOURCES/gcc8-aarch64-mtune-neoverse-512tvb.patch

@@ -0,0 +1,105 @@
+From 9c108bb84d3a2447dac730c455df658be0a2c751 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <richard.sandiford@arm.com>
+Date: Tue, 17 Aug 2021 15:15:27 +0100
+Subject: [PATCH] aarch64: Add -mtune=neoverse-512tvb
+To: gcc-patches@gcc.gnu.org
+
+This patch adds an option to tune for Neoverse cores that have
+a total vector bandwidth of 512 bits (4x128 for Advanced SIMD
+and a vector-length-dependent equivalent for SVE).  This is intended
+to be a compromise between tuning aggressively for a single core like
+Neoverse V1 (which can be too narrow) and tuning for AArch64 cores
+in general (which can be too wide).
+
+-mcpu=neoverse-512tvb is equivalent to -mcpu=neoverse-v1
+-mtune=neoverse-512tvb.
+
+gcc/
+	* doc/invoke.texi: Document -mtune=neoverse-512tvb and
+	-mcpu=neoverse-512tvb.
+	* config/aarch64/aarch64-cores.def (neoverse-512tvb): New entry.
+	* config/aarch64/aarch64-tune.md: Regenerate.
+
+(cherry picked from commit 048039c49b96875144f67e7789fdea54abf7710b)
+---
+ gcc/config/aarch64/aarch64-cores.def |  1 +
+ gcc/config/aarch64/aarch64-tune.md   |  2 +-
+ gcc/doc/invoke.texi                  | 25 ++++++++++++++++++++++---
+ 3 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/config/aarch64/aarch64-cores.def b/gcc/config/aarch64/aarch64-cores.def
+index dfb839c01cc..f348d31e22e 100644
+--- a/gcc/config/aarch64/aarch64-cores.def
++++ b/gcc/config/aarch64/aarch64-cores.def
+@@ -99,6 +99,7 @@ AARCH64_CORE("saphira",     saphira,    falkor,    8_3A,  AARCH64_FL_FOR_ARCH8_3
+ /* ARM ('A') cores. */
+ AARCH64_CORE("zeus", zeus, cortexa57, 8_4A,  AARCH64_FL_FOR_ARCH8_4 | AARCH64_FL_F16 | AARCH64_FL_RCPC | AARCH64_FL_SVE | AARCH64_FL_RNG, neoversev1, 0x41, 0xd40, -1)
+ AARCH64_CORE("neoverse-v1", neoversev1, cortexa57, 8_4A,  AARCH64_FL_FOR_ARCH8_4 | AARCH64_FL_F16 | AARCH64_FL_RCPC | AARCH64_FL_SVE | AARCH64_FL_RNG, neoversev1, 0x41, 0xd40, -1)
++AARCH64_CORE("neoverse-512tvb", neoverse512tvb, cortexa57, 8_4A,  AARCH64_FL_FOR_ARCH8_4 | AARCH64_FL_F16 | AARCH64_FL_RCPC | AARCH64_FL_SVE | AARCH64_FL_RNG, neoversev1, INVALID_IMP, INVALID_CORE, -1)
+ 
+ /* Armv8.5-A Architecture Processors.  */
+ AARCH64_CORE("neoverse-n2", neoversen2, cortexa57, 8_4A,  AARCH64_FL_FOR_ARCH8_4 | AARCH64_FL_F16 | AARCH64_FL_SVE | AARCH64_FL_RNG, neoversen2, 0x41, 0xd49, -1)
+diff --git a/gcc/config/aarch64/aarch64-tune.md b/gcc/config/aarch64/aarch64-tune.md
+index 2d7c9aa4740..09b76480f0b 100644
+--- a/gcc/config/aarch64/aarch64-tune.md
++++ b/gcc/config/aarch64/aarch64-tune.md
+@@ -1,5 +1,5 @@
+ ;; -*- buffer-read-only: t -*-
+ ;; Generated automatically by gentune.sh from aarch64-cores.def
+ (define_attr "tune"
+-	"cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,thunderxt81,thunderxt83,xgene1,falkor,qdf24xx,exynosm1,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,ares,neoversen1,saphira,zeus,neoversev1,neoversen2,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55"
++	"cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,thunderxt81,thunderxt83,xgene1,falkor,qdf24xx,exynosm1,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,ares,neoversen1,saphira,zeus,neoversev1,neoverse512tvb,neoversen2,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55"
+ 	(const (symbol_ref "((enum attr_tune) aarch64_tune)")))
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 78ca7738df2..68fda03281a 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -14772,9 +14772,9 @@ performance of the code.  Permissible values for this option are:
+ @samp{generic}, @samp{cortex-a35}, @samp{cortex-a53}, @samp{cortex-a55},
+ @samp{cortex-a57}, @samp{cortex-a72}, @samp{cortex-a73}, @samp{cortex-a75},
+ @samp{cortex-a76}, @samp{ares}, @samp{neoverse-n1}, @samp{neoverse-n2},
+-@samp{neoverse-v1}, @samp{zeus}, @samp{exynos-m1}, @samp{falkor},
+-@samp{qdf24xx}, @samp{saphira}, @samp{xgene1}, @samp{vulcan}, @samp{thunderx},
+-@samp{thunderxt88}, @samp{thunderxt88p1}, @samp{thunderxt81},
++@samp{neoverse-v1}, @samp{zeus}, @samp{neoverse-512tvb}, @samp{exynos-m1},
++@samp{falkor}, @samp{qdf24xx}, @samp{saphira}, @samp{xgene1}, @samp{vulcan},
++@samp{thunderx}, @samp{thunderxt88}, @samp{thunderxt88p1}, @samp{thunderxt81},
+ @samp{thunderxt83}, @samp{thunderx2t99}, @samp{cortex-a57.cortex-a53},
+ @samp{cortex-a72.cortex-a53}, @samp{cortex-a73.cortex-a35},
+ @samp{cortex-a73.cortex-a53}, @samp{cortex-a75.cortex-a55},
+@@ -14785,6 +14785,15 @@ The values @samp{cortex-a57.cortex-a53}, @samp{cortex-a72.cortex-a53},
+ @samp{cortex-a75.cortex-a55} specify that GCC should tune for a
+ big.LITTLE system.
+ 
++The value @samp{neoverse-512tvb} specifies that GCC should tune
++for Neoverse cores that (a) implement SVE and (b) have a total vector
++bandwidth of 512 bits per cycle.  In other words, the option tells GCC to
++tune for Neoverse cores that can execute 4 128-bit Advanced SIMD arithmetic
++instructions a cycle and that can execute an equivalent number of SVE
++arithmetic instructions per cycle (2 for 256-bit SVE, 4 for 128-bit SVE).
++This is more general than tuning for a specific core like Neoverse V1
++but is more specific than the default tuning described below.
++
+ Additionally on native AArch64 GNU/Linux systems the value
+ @samp{native} tunes performance to the host system.  This option has no effect
+ if the compiler is unable to recognize the processor of the host system.
+@@ -14814,6 +14823,16 @@ by @option{-mtune}).  Where this option is used in conjunction
+ with @option{-march} or @option{-mtune}, those options take precedence
+ over the appropriate part of this option.
+ 
++@option{-mcpu=neoverse-512tvb} is special in that it does not refer
++to a specific core, but instead refers to all Neoverse cores that
++(a) implement SVE and (b) have a total vector bandwidth of 512 bits
++a cycle.  Unless overridden by @option{-march},
++@option{-mcpu=neoverse-512tvb} generates code that can run on a
++Neoverse V1 core, since Neoverse V1 is the first Neoverse core with
++these properties.  Unless overridden by @option{-mtune},
++@option{-mcpu=neoverse-512tvb} tunes code in the same way as for
++@option{-mtune=neoverse-512tvb}.
++
+ @item -moverride=@var{string}
+ @opindex moverride
+ Override tuning decisions made by the back-end in response to a
+-- 
+2.25.1
+

SOURCES/gcc8-foffload-default.patch

@@ -1,22 +1,21 @@
-2019-01-17  Jakub Jelinek  <jakub@redhat.com>
+2017-01-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.c (offload_targets_default): New variable.
 	(process_command): Set it if -foffload is defaulted.
 	(driver::maybe_putenv_OFFLOAD_TARGETS): Add OFFLOAD_TARGET_DEFAULT=1
 	into environment if -foffload has been defaulted.
 	* lto-wrapper.c (OFFLOAD_TARGET_DEFAULT_ENV): Define.
-	(compile_offload_image): If OFFLOAD_TARGET_DEFAULT
+	(compile_images_for_offload_targets): If OFFLOAD_TARGET_DEFAULT
 	is in the environment, don't fail if corresponding mkoffload
-	can't be found.
+	can't be found.  Free and clear offload_names if no valid offload
-	(compile_images_for_offload_targets): Likewise.  Free and clear
+	is found.
-	offload_names if no valid offload is found.
 libgomp/
 	* target.c (gomp_load_plugin_for_device): If a plugin can't be
 	dlopened, assume it has no devices silently.
 
 --- gcc/gcc.c.jj	2017-01-17 10:28:40.000000000 +0100
 +++ gcc/gcc.c	2017-01-20 16:26:29.649962902 +0100
-@@ -319,6 +319,10 @@ static const char *spec_host_machine = D
+@@ -290,6 +290,10 @@ static const char *spec_host_machine = D
  
  static char *offload_targets = NULL;
  
@@ -27,7 +26,7 @@ libgomp/
  /* Nonzero if cross-compiling.
     When -b is used, the value comes from the `specs' file.  */
  
-@@ -4828,7 +4832,10 @@ process_command (unsigned int decoded_op
+@@ -4457,7 +4461,10 @@ process_command (unsigned int decoded_op
    /* If the user didn't specify any, default to all configured offload
       targets.  */
    if (ENABLE_OFFLOADING && offload_targets == NULL)
@@ -37,9 +36,9 @@ libgomp/
 +      offload_targets_default = true;
 +    }
  
-   /* Handle -gtoggle as it would later in toplev.c:process_options to
+   if (output_file
-      make the debug-level-gt spec function work as expected.  */
+       && strcmp (output_file, "-") != 0
-@@ -8494,6 +8501,8 @@ driver::maybe_putenv_OFFLOAD_TARGETS ()
+@@ -7693,6 +7700,8 @@ driver::maybe_putenv_OFFLOAD_TARGETS ()
        obstack_grow (&collect_obstack, offload_targets,
  		    strlen (offload_targets) + 1);
        xputenv (XOBFINISH (&collect_obstack, char *));
@@ -56,53 +55,55 @@ libgomp/
  #define OFFLOAD_TARGET_NAMES_ENV	"OFFLOAD_TARGET_NAMES"
 +#define OFFLOAD_TARGET_DEFAULT_ENV	"OFFLOAD_TARGET_DEFAULT"
  
- /* By default there is no special suffix for target executables.  */
+ enum lto_mode_d {
- #ifdef TARGET_EXECUTABLE_SUFFIX
+   LTO_MODE_NONE,			/* Not doing LTO.  */
-@@ -906,6 +907,12 @@ compile_offload_image (const char *targe
+@@ -790,8 +791,10 @@ compile_images_for_offload_targets (unsi
- 	break;
-       }
- 
-+  if (!compiler && getenv (OFFLOAD_TARGET_DEFAULT_ENV))
-+    {
-+      free_array_of_ptrs ((void **) paths, n_paths);
-+      return NULL;
-+    }
-+
-   if (!compiler)
-     fatal_error (input_location,
- 		 "could not find %s in %s (consider using %<-B%>)",
-@@ -975,6 +982,7 @@ compile_images_for_offload_targets (unsi
    if (!target_names)
      return;
    unsigned num_targets = parse_env_var (target_names, &names, NULL);
-+  int next_name_entry = 0;
++  const char *target_names_default = getenv (OFFLOAD_TARGET_DEFAULT_ENV);
  
+   int next_name_entry = 0;
++  bool hsa_seen = false;
    const char *compiler_path = getenv ("COMPILER_PATH");
    if (!compiler_path)
-@@ -985,13 +993,19 @@ compile_images_for_offload_targets (unsi
+     goto out;
-   offload_names = XCNEWVEC (char *, num_targets + 1);
+@@ -804,18 +807,32 @@ compile_images_for_offload_targets (unsi
-   for (unsigned i = 0; i < num_targets; i++)
+       /* HSA does not use LTO-like streaming and a different compiler, skip
-     {
+ 	 it. */
--      offload_names[i]
+       if (strcmp (names[i], "hsa") == 0)
-+      offload_names[next_name_entry]
+-	continue;
++	{
++	  hsa_seen = true;
++	  continue;
++	}
+ 
+       offload_names[next_name_entry]
  	= compile_offload_image (names[i], compiler_path, in_argc, in_argv,
  				 compiler_opts, compiler_opt_count,
  				 linker_opts, linker_opt_count);
--      if (!offload_names[i])
+       if (!offload_names[next_name_entry])
 -	fatal_error (input_location,
--		     "problem with building target image for %s", names[i]);
+-		     "problem with building target image for %s\n", names[i]);
-+      if (!offload_names[next_name_entry])
++	{
++	  if (target_names_default != NULL)
 +	    continue;
-+      next_name_entry++;
++	  fatal_error (input_location,
++		       "problem with building target image for %s\n",
++		       names[i]);
 +	}
-+
+       next_name_entry++;
-+  if (next_name_entry == 0)
+     }
+ 
++  if (next_name_entry == 0 && !hsa_seen)
 +    {
 +      free (offload_names);
 +      offload_names = NULL;
-     }
++    }
- 
++
   out:
+   free_array_of_ptrs ((void **) names, num_targets);
+ }
 --- libgomp/target.c.jj	2017-01-01 12:45:52.000000000 +0100
 +++ libgomp/target.c	2017-01-20 20:12:13.756710875 +0100
 @@ -2356,7 +2356,7 @@ gomp_load_plugin_for_device (struct gomp

SOURCES/gcc8-hack.patch

@@ -1,8 +1,8 @@
---- libada/Makefile.in.jj	2019-01-09 13:01:18.015608205 +0100
+--- libada/Makefile.in.jj	2009-01-14 12:07:35.000000000 +0100
-+++ libada/Makefile.in	2019-01-11 18:16:23.441726931 +0100
++++ libada/Makefile.in	2009-01-15 14:25:33.000000000 +0100
-@@ -71,18 +71,40 @@ version := $(shell @get_gcc_base_ver@ $(
+@@ -66,18 +66,40 @@ libsubdir := $(libdir)/gcc/$(target_nonc
- libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
  ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
+ ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
  
 +DEFAULTMULTIFLAGS :=
 +ifeq ($(MULTISUBDIR),)
@@ -45,17 +45,17 @@
          "PICFLAG_FOR_TARGET=$(PICFLAG)" \
          "THREAD_KIND=$(THREAD_KIND)" \
          "TRACE=$(TRACE)" \
-@@ -93,7 +115,7 @@ LIBADA_FLAGS_TO_PASS = \
+@@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
          "exeext=.exeext.should.not.be.used " \
  	'CC=the.host.compiler.should.not.be.needed' \
  	"GCC_FOR_TARGET=$(CC)" \
 -        "CFLAGS=$(CFLAGS)"
 +        "CFLAGS=$(CFLAGS) $(DEFAULTMULTIFLAGS)"
  
- .PHONY: libada gnatlib gnatlib-shared gnatlib-sjlj gnatlib-zcx osconstool
+ # Rules to build gnatlib.
- 
+ .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
---- config-ml.in.jj	2019-01-09 12:50:16.646501448 +0100
+--- config-ml.in.jj	2010-06-30 09:50:44.000000000 +0200
-+++ config-ml.in	2019-01-11 18:16:23.442726914 +0100
++++ config-ml.in	2010-07-02 21:24:17.994211151 +0200
 @@ -511,6 +511,8 @@ multi-do:
  				ADAFLAGS="$(ADAFLAGS) $${flags}" \
  				prefix="$(prefix)" \
@@ -63,44 +63,42 @@
 +				mandir="$(mandir)" \
 +				infodir="$(infodir)" \
  				GOCFLAGS="$(GOCFLAGS) $${flags}" \
- 				GDCFLAGS="$(GDCFLAGS) $${flags}" \
  				CXXFLAGS="$(CXXFLAGS) $${flags}" \
---- libcpp/macro.c.jj	2019-01-09 13:01:21.420552123 +0100
+ 				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
-+++ libcpp/macro.c	2019-01-11 18:18:17.736876285 +0100
+--- libcpp/macro.c.jj	2015-01-14 11:01:34.000000000 +0100
-@@ -3256,8 +3256,6 @@ static cpp_macro *
++++ libcpp/macro.c	2015-01-14 14:22:19.286949884 +0100
- create_iso_definition (cpp_reader *pfile)
+@@ -2947,8 +2947,6 @@ create_iso_definition (cpp_reader *pfile
- {
+   cpp_token *token;
+   const cpp_token *ctoken;
    bool following_paste_op = false;
 -  const char *paste_op_error_msg =
 -    N_("'##' cannot appear at either end of a macro expansion");
    unsigned int num_extra_tokens = 0;
-   unsigned nparms = 0;
+ 
-   cpp_hashnode **params = NULL;
+   /* Get the first token of the expansion (or the '(' of a
-@@ -3382,7 +3380,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3059,7 +3057,8 @@ create_iso_definition (cpp_reader *pfile
  	     function-like macros, but not at the end.  */
  	  if (following_paste_op)
  	    {
 -	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
 +	      cpp_error (pfile, CPP_DL_ERROR,
-+			 "'##' cannot appear at either end of a macro "
++			 "'##' cannot appear at either end of a macro expansion");
-+			 "expansion");
+ 	      return false;
- 	      goto out;
  	    }
- 	  if (!vaopt_tracker.completed ())
+ 	  break;
-@@ -3397,7 +3397,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3072,7 +3071,8 @@ create_iso_definition (cpp_reader *pfile
  	     function-like macros, but not at the beginning.  */
  	  if (macro->count == 1)
  	    {
 -	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
 +	      cpp_error (pfile, CPP_DL_ERROR,
-+			 "'##' cannot appear at either end of a macro "
++			 "'##' cannot appear at either end of a macro expansion");
-+			 "expansion");
+ 	      return false;
- 	      goto out;
  	    }
  
---- libcpp/expr.c.jj	2019-01-09 13:01:22.415535734 +0100
+--- libcpp/expr.c.jj	2015-01-14 11:01:34.000000000 +0100
-+++ libcpp/expr.c	2019-01-11 18:16:23.444726882 +0100
++++ libcpp/expr.c	2015-01-14 14:35:52.851002344 +0100
-@@ -803,16 +803,17 @@ cpp_classify_number (cpp_reader *pfile,
+@@ -672,16 +672,17 @@ cpp_classify_number (cpp_reader *pfile,
        if ((result & CPP_N_WIDTH) == CPP_N_LARGE
  	  && CPP_OPTION (pfile, cpp_warn_long_long))
          {
@@ -123,4 +121,4 @@
 +				      : N_("use of C99 long long integer constant"));
          }
  
-       if ((result & CPP_N_SIZE_T) == CPP_N_SIZE_T
+       result |= CPP_N_INTEGER;

SOURCES/gcc8-harden-1.patch

@@ -0,0 +1,294 @@
+From 88bf1c3910e4cf97dcb85c6d32291c23e572a516 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 27 Oct 2021 07:48:54 -0700
+Subject: [PATCH 1/4] x86: Add -mharden-sls=[none|all|return|indirect-branch]
+
+Add -mharden-sls= to mitigate against straight line speculation (SLS)
+for function return and indirect branch by adding an INT3 instruction
+after function return and indirect branch.
+
+gcc/
+
+	PR target/102952
+	* config/i386/i386-opts.h (harden_sls): New enum.
+	* config/i386/i386.c (output_indirect_thunk): Mitigate against
+	SLS for function return.
+	(ix86_output_function_return): Likewise.
+	(ix86_output_jmp_thunk_or_indirect): Mitigate against indirect
+	branch.
+	(ix86_output_indirect_jmp): Likewise.
+	(ix86_output_call_insn): Likewise.
+	* config/i386/i386.opt: Add -mharden-sls=.
+	* doc/invoke.texi: Document -mharden-sls=.
+
+gcc/testsuite/
+
+	PR target/102952
+	* gcc.target/i386/harden-sls-1.c: New test.
+	* gcc.target/i386/harden-sls-2.c: Likewise.
+	* gcc.target/i386/harden-sls-3.c: Likewise.
+	* gcc.target/i386/harden-sls-4.c: Likewise.
+	* gcc.target/i386/harden-sls-5.c: Likewise.
+
+(cherry picked from commit 53a643f8568067d7700a9f2facc8ba39974973d3)
+---
+ gcc/config/i386/i386-opts.h                  |  7 +++++++
+ gcc/config/i386/i386.c                       | 22 +++++++++++++++-----
+ gcc/config/i386/i386.opt                     | 20 ++++++++++++++++++
+ gcc/doc/invoke.texi                          | 10 ++++++++-
+ gcc/testsuite/gcc.target/i386/harden-sls-1.c | 14 +++++++++++++
+ gcc/testsuite/gcc.target/i386/harden-sls-2.c | 14 +++++++++++++
+ gcc/testsuite/gcc.target/i386/harden-sls-3.c | 14 +++++++++++++
+ gcc/testsuite/gcc.target/i386/harden-sls-4.c | 16 ++++++++++++++
+ gcc/testsuite/gcc.target/i386/harden-sls-5.c | 17 +++++++++++++++
+ 9 files changed, 128 insertions(+), 6 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-2.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-3.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-4.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-5.c
+
+diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h
+index 46366cbfa72..34718b6d52c 100644
+--- a/gcc/config/i386/i386-opts.h
++++ b/gcc/config/i386/i386-opts.h
+@@ -119,4 +119,11 @@ enum indirect_branch {
+   indirect_branch_thunk_extern
+ };
+ 
++enum harden_sls {
++  harden_sls_none = 0,
++  harden_sls_return = 1 << 0,
++  harden_sls_indirect_branch = 1 << 1,
++  harden_sls_all = harden_sls_return | harden_sls_indirect_branch
++};
++
+ #endif
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 31502774ef3..eb9303f8742 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -10977,6 +10977,9 @@ output_indirect_thunk (enum indirect_thunk_prefix need_prefix,
+     fputs ("\tbnd ret\n", asm_out_file);
+   else
+     fputs ("\tret\n", asm_out_file);
++
++  if ((ix86_harden_sls & harden_sls_return))
++    fputs ("\tint3\n", asm_out_file);
+ }
+ 
+ /* Output a funtion with a call and return thunk for indirect branch.
+@@ -28728,6 +28731,8 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name,
+ 	fprintf (asm_out_file, "\tjmp\t");
+       assemble_name (asm_out_file, thunk_name);
+       putc ('\n', asm_out_file);
++      if ((ix86_harden_sls & harden_sls_indirect_branch))
++	fputs ("\tint3\n", asm_out_file);
+     }
+   else
+     output_indirect_thunk (need_prefix, regno);
+@@ -28973,10 +28978,10 @@ ix86_output_indirect_jmp (rtx call_op)
+ 	gcc_unreachable ();
+ 
+       ix86_output_indirect_branch (call_op, "%0", true);
+-      return "";
+     }
+   else
+-    return "%!jmp\t%A0";
++    output_asm_insn ("%!jmp\t%A0", &call_op);
++  return (ix86_harden_sls & harden_sls_indirect_branch) ? "int3" : "";
+ }
+ 
+ /* Output function return.  CALL_OP is the jump target.  Add a REP
+@@ -29018,9 +29023,11 @@ ix86_output_function_return (bool long_p)
+     }
+ 
+   if (!long_p || ix86_bnd_prefixed_insn_p (current_output_insn))
+-    return "%!ret";
++    output_asm_insn ("%!ret", NULL);
++  else
++    output_asm_insn ("rep%; ret", NULL);
+ 
+-  return "rep%; ret";
++  return (ix86_harden_sls & harden_sls_return) ? "int3" : "";
+ }
+ 
+ /* Output indirect function return.  RET_OP is the function return
+@@ -29158,7 +29165,12 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op)
+       if (output_indirect_p && !direct_p)
+ 	ix86_output_indirect_branch (call_op, xasm, true);
+       else
+-	output_asm_insn (xasm, &call_op);
++	{
++	  output_asm_insn (xasm, &call_op);
++	  if (!direct_p
++	      && (ix86_harden_sls & harden_sls_indirect_branch))
++	    return "int3";
++	}
+       return "";
+     }
+ 
+diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
+index d9bd909a885..3ae48609e25 100644
+--- a/gcc/config/i386/i386.opt
++++ b/gcc/config/i386/i386.opt
+@@ -1055,3 +1055,23 @@ Support MOVDIRI built-in functions and code generation.
+ mmovdir64b
+ Target Report Mask(ISA_MOVDIR64B) Var(ix86_isa_flags2) Save
+ Support MOVDIR64B built-in functions and code generation.
++
++mharden-sls=
++Target RejectNegative Joined Enum(harden_sls) Var(ix86_harden_sls) Init(harden_sls_none)
++Generate code to mitigate against straight line speculation.
++
++Enum
++Name(harden_sls) Type(enum harden_sls)
++Known choices for mitigation against straight line speculation with -mharden-sls=:
++
++EnumValue
++Enum(harden_sls) String(none) Value(harden_sls_none)
++
++EnumValue
++Enum(harden_sls) String(return) Value(harden_sls_return)
++
++EnumValue
++Enum(harden_sls) String(indirect-branch) Value(harden_sls_indirect_branch)
++
++EnumValue
++Enum(harden_sls) String(all) Value(harden_sls_all)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 78ca7738df2..1e20efd6969 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -1284,7 +1284,7 @@ See RS/6000 and PowerPC Options.
+ -mstack-protector-guard-symbol=@var{symbol} -mmitigate-rop @gol
+ -mgeneral-regs-only -mcall-ms2sysv-xlogues @gol
+ -mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol
+--mindirect-branch-register}
++-mindirect-branch-register -mharden-sls=@var{choice}}
+ 
+ @emph{x86 Windows Options}
+ @gccoptlist{-mconsole  -mcygwin  -mno-cygwin  -mdll @gol
+@@ -28036,6 +28036,14 @@ not be reachable in the large code model.
+ @opindex -mindirect-branch-register
+ Force indirect call and jump via register.
+ 
++@item -mharden-sls=@var{choice}
++@opindex mharden-sls
++Generate code to mitigate against straight line speculation (SLS) with
++@var{choice}.  The default is @samp{none} which disables all SLS
++hardening.  @samp{return} enables SLS hardening for function return.
++@samp{indirect-branch} enables SLS hardening for indirect branch.
++@samp{all} enables all SLS hardening.
++
+ @end table
+ 
+ These @samp{-m} switches are supported in addition to the above
+diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-1.c b/gcc/testsuite/gcc.target/i386/harden-sls-1.c
+new file mode 100644
+index 00000000000..6f70dc94a23
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/harden-sls-1.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -mharden-sls=all" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++extern void foo (void);
++
++void
++bar (void)
++{
++  foo ();
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]+_?foo" } } */
++/* { dg-final { scan-assembler-not {int3} } } */
+diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-2.c b/gcc/testsuite/gcc.target/i386/harden-sls-2.c
+new file mode 100644
+index 00000000000..a7c59078d03
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/harden-sls-2.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk-extern -mharden-sls=all" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++extern void (*fptr) (void);
++
++void
++foo (void)
++{
++  fptr ();
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]+_?__x86_indirect_thunk_(r|e)ax" } } */
++/* { dg-final { scan-assembler-times "int3" 1 } } */
+diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-3.c b/gcc/testsuite/gcc.target/i386/harden-sls-3.c
+new file mode 100644
+index 00000000000..1a6056b6d7b
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/harden-sls-3.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=thunk -mharden-sls=all" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++extern void (*fptr) (void);
++
++void
++foo (void)
++{
++  fptr ();
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]+_?__x86_indirect_thunk_(r|e)ax" } } */
++/* { dg-final { scan-assembler-times "int3" 2 } } */
+diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-4.c b/gcc/testsuite/gcc.target/i386/harden-sls-4.c
+new file mode 100644
+index 00000000000..f70dd1379d3
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/harden-sls-4.c
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mindirect-branch=keep -mharden-sls=all" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++extern void (*fptr) (void);
++
++void
++foo (void)
++{
++  fptr ();
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]+\\*_?fptr" { target { ! x32 } } } } */
++/* { dg-final { scan-assembler "movl\[ \t\]+fptr\\(%rip\\), %eax" { target x32 } } } */
++/* { dg-final { scan-assembler "jmp\[ \t\]+\\*%rax" { target x32 } } } */
++/* { dg-final { scan-assembler-times "int3" 1 } } */
+diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-5.c b/gcc/testsuite/gcc.target/i386/harden-sls-5.c
+new file mode 100644
+index 00000000000..613c44c6f82
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/harden-sls-5.c
+@@ -0,0 +1,17 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -mharden-sls=return" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++typedef void (*dispatch_t)(long offset);
++
++dispatch_t dispatch;
++
++int
++male_indirect_jump (long offset)
++{
++  dispatch(offset);
++  return 0;
++}
++
++/* { dg-final { scan-assembler-times "ret" 1 } } */
++/* { dg-final { scan-assembler-times "int3" 1 } } */
+-- 
+2.36.1
+

SOURCES/gcc8-harden-2.patch

@@ -0,0 +1,155 @@
+From 0df8313a0a5d8533f2487e21d7b42e9adee28f18 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 27 Oct 2021 06:27:15 -0700
+Subject: [PATCH 2/4] x86: Add -mindirect-branch-cs-prefix
+
+Add -mindirect-branch-cs-prefix to add CS prefix to call and jmp to
+indirect thunk with branch target in r8-r15 registers so that the call
+and jmp instruction length is 6 bytes to allow them to be replaced with
+"lfence; call *%r8-r15" or "lfence; jmp *%r8-r15" at run-time.
+
+gcc/
+
+	PR target/102952
+	* config/i386/i386.c (ix86_output_jmp_thunk_or_indirect): Emit
+	CS prefix for -mindirect-branch-cs-prefix.
+	(ix86_output_indirect_branch_via_reg): Likewise.
+	* config/i386/i386.opt: Add -mindirect-branch-cs-prefix.
+	* doc/invoke.texi: Document -mindirect-branch-cs-prefix.
+
+gcc/testsuite/
+
+	PR target/102952
+	* gcc.target/i386/indirect-thunk-cs-prefix-1.c: New test.
+	* gcc.target/i386/indirect-thunk-cs-prefix-2.c: Likewise.
+
+(cherry picked from commit 2196a681d7810ad8b227bf983f38ba716620545e)
+---
+ gcc/config/i386/i386.c                            | 14 ++++++++++++--
+ gcc/config/i386/i386.opt                          |  4 ++++
+ gcc/doc/invoke.texi                               | 10 +++++++++-
+ .../gcc.target/i386/indirect-thunk-cs-prefix-1.c  | 14 ++++++++++++++
+ .../gcc.target/i386/indirect-thunk-cs-prefix-2.c  | 15 +++++++++++++++
+ 5 files changed, 54 insertions(+), 3 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c
+ create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index eb9303f8742..8442dd0daea 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -28728,7 +28728,12 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name,
+       if (need_prefix == indirect_thunk_prefix_bnd)
+ 	fprintf (asm_out_file, "\tbnd jmp\t");
+       else
+-	fprintf (asm_out_file, "\tjmp\t");
++	{
++	  if (REX_INT_REGNO_P (regno)
++	      && ix86_indirect_branch_cs_prefix)
++	    fprintf (asm_out_file, "\tcs\n");
++	  fprintf (asm_out_file, "\tjmp\t");
++	}
+       assemble_name (asm_out_file, thunk_name);
+       putc ('\n', asm_out_file);
+       if ((ix86_harden_sls & harden_sls_indirect_branch))
+@@ -28787,7 +28792,12 @@ ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p)
+ 	  if (need_prefix == indirect_thunk_prefix_bnd)
+ 	    fprintf (asm_out_file, "\tbnd call\t");
+ 	  else
+-	    fprintf (asm_out_file, "\tcall\t");
++	    {
++	      if (REX_INT_REGNO_P (regno)
++		  && ix86_indirect_branch_cs_prefix)
++		fprintf (asm_out_file, "\tcs\n");
++	      fprintf (asm_out_file, "\tcall\t");
++	    }
+ 	  assemble_name (asm_out_file, thunk_name);
+ 	  putc ('\n', asm_out_file);
+ 	  return;
+diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
+index 3ae48609e25..9f67ef558dc 100644
+--- a/gcc/config/i386/i386.opt
++++ b/gcc/config/i386/i386.opt
+@@ -1044,6 +1044,10 @@ Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline)
+ EnumValue
+ Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern)
+ 
++mindirect-branch-cs-prefix
++Target Var(ix86_indirect_branch_cs_prefix) Init(0)
++Add CS prefix to call and jmp to indirect thunk with branch target in r8-r15 registers.
++
+ mindirect-branch-register
+ Target Report Var(ix86_indirect_branch_register) Init(0)
+ Force indirect call and jump via register.
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 1e20efd6969..605cd4b93f1 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -1284,7 +1284,8 @@ See RS/6000 and PowerPC Options.
+ -mstack-protector-guard-symbol=@var{symbol} -mmitigate-rop @gol
+ -mgeneral-regs-only -mcall-ms2sysv-xlogues @gol
+ -mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol
+--mindirect-branch-register -mharden-sls=@var{choice}}
++-mindirect-branch-register -mharden-sls=@var{choice} @gol
++-mindirect-branch-cs-prefix}
+ 
+ @emph{x86 Windows Options}
+ @gccoptlist{-mconsole  -mcygwin  -mno-cygwin  -mdll @gol
+@@ -28044,6 +28045,13 @@ hardening.  @samp{return} enables SLS hardening for function return.
+ @samp{indirect-branch} enables SLS hardening for indirect branch.
+ @samp{all} enables all SLS hardening.
+ 
++@item -mindirect-branch-cs-prefix
++@opindex mindirect-branch-cs-prefix
++Add CS prefix to call and jmp to indirect thunk with branch target in
++r8-r15 registers so that the call and jmp instruction length is 6 bytes
++to allow them to be replaced with @samp{lfence; call *%r8-r15} or
++@samp{lfence; jmp *%r8-r15} at run-time.
++
+ @end table
+ 
+ These @samp{-m} switches are supported in addition to the above
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c
+new file mode 100644
+index 00000000000..db2f3416823
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile { target { ! ia32 } } } */
++/* { dg-options "-O2 -ffixed-rax -ffixed-rbx -ffixed-rcx -ffixed-rdx -ffixed-rdi -ffixed-rsi -mindirect-branch-cs-prefix -mindirect-branch=thunk-extern" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++extern void (*fptr) (void);
++
++void
++foo (void)
++{
++  fptr ();
++}
++
++/* { dg-final { scan-assembler-times "jmp\[ \t\]+_?__x86_indirect_thunk_r\[0-9\]+" 1 } } */
++/* { dg-final { scan-assembler-times "\tcs" 1 } } */
+diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c
+new file mode 100644
+index 00000000000..adfc39a49d4
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c
+@@ -0,0 +1,15 @@
++/* { dg-do compile { target { ! ia32 } } } */
++/* { dg-options "-O2 -ffixed-rax -ffixed-rbx -ffixed-rcx -ffixed-rdx -ffixed-rdi -ffixed-rsi -mindirect-branch-cs-prefix -mindirect-branch=thunk-extern" } */
++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
++
++extern void (*bar) (void);
++
++int
++foo (void)
++{
++  bar ();
++  return 0;
++}
++
++/* { dg-final { scan-assembler-times "call\[ \t\]+_?__x86_indirect_thunk_r\[0-9\]+" 1 } } */
++/* { dg-final { scan-assembler-times "\tcs" 1 } } */
+-- 
+2.36.1
+

SOURCES/gcc8-harden-3.patch

@@ -0,0 +1,108 @@
+From 621de498ee19e1f2642eebde707430254c0459c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 5 Jan 2022 16:33:16 -0800
+Subject: [PATCH 3/4] x86: Rename -harden-sls=indirect-branch to
+ -harden-sls=indirect-jmp
+
+Indirect branch also includes indirect call instructions.  Rename
+-harden-sls=indirect-branch to -harden-sls=indirect-jmp to match its
+intended behavior.
+
+	PR target/102952
+	* config/i386/i386-opts.h (harden_sls): Replace
+	harden_sls_indirect_branch with harden_sls_indirect_jmp.
+	* config/i386/i386.c (ix86_output_jmp_thunk_or_indirect):
+	Likewise.
+	(ix86_output_indirect_jmp): Likewise.
+	(ix86_output_call_insn): Likewise.
+	* config/i386/i386.opt: Replace indirect-branch with
+	indirect-jmp.  Replace harden_sls_indirect_branch with
+	harden_sls_indirect_jmp.
+	* doc/invoke.texi (-harden-sls=): Replace indirect-branch with
+	indirect-jmp.
+
+(cherry picked from commit ed8060950c64f2e449aaf90e438aa26d0d9d0b31)
+---
+ gcc/config/i386/i386-opts.h | 4 ++--
+ gcc/config/i386/i386.c      | 6 +++---
+ gcc/config/i386/i386.opt    | 2 +-
+ gcc/doc/invoke.texi         | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h
+index 34718b6d52c..47facc254cd 100644
+--- a/gcc/config/i386/i386-opts.h
++++ b/gcc/config/i386/i386-opts.h
+@@ -122,8 +122,8 @@ enum indirect_branch {
+ enum harden_sls {
+   harden_sls_none = 0,
+   harden_sls_return = 1 << 0,
+-  harden_sls_indirect_branch = 1 << 1,
+-  harden_sls_all = harden_sls_return | harden_sls_indirect_branch
++  harden_sls_indirect_jmp = 1 << 1,
++  harden_sls_all = harden_sls_return | harden_sls_indirect_jmp
+ };
+ 
+ #endif
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 8442dd0daea..3bc14e20105 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -28736,7 +28736,7 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name,
+ 	}
+       assemble_name (asm_out_file, thunk_name);
+       putc ('\n', asm_out_file);
+-      if ((ix86_harden_sls & harden_sls_indirect_branch))
++      if ((ix86_harden_sls & harden_sls_indirect_jmp))
+ 	fputs ("\tint3\n", asm_out_file);
+     }
+   else
+@@ -28991,7 +28991,7 @@ ix86_output_indirect_jmp (rtx call_op)
+     }
+   else
+     output_asm_insn ("%!jmp\t%A0", &call_op);
+-  return (ix86_harden_sls & harden_sls_indirect_branch) ? "int3" : "";
++  return (ix86_harden_sls & harden_sls_indirect_jmp) ? "int3" : "";
+ }
+ 
+ /* Output function return.  CALL_OP is the jump target.  Add a REP
+@@ -29178,7 +29178,7 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op)
+ 	{
+ 	  output_asm_insn (xasm, &call_op);
+ 	  if (!direct_p
+-	      && (ix86_harden_sls & harden_sls_indirect_branch))
++	      && (ix86_harden_sls & harden_sls_indirect_jmp))
+ 	    return "int3";
+ 	}
+       return "";
+diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
+index 9f67ef558dc..7a5c7b9369a 100644
+--- a/gcc/config/i386/i386.opt
++++ b/gcc/config/i386/i386.opt
+@@ -1075,7 +1075,7 @@ EnumValue
+ Enum(harden_sls) String(return) Value(harden_sls_return)
+ 
+ EnumValue
+-Enum(harden_sls) String(indirect-branch) Value(harden_sls_indirect_branch)
++Enum(harden_sls) String(indirect-jmp) Value(harden_sls_indirect_jmp)
+ 
+ EnumValue
+ Enum(harden_sls) String(all) Value(harden_sls_all)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 605cd4b93f1..20d8e3fd782 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -28041,8 +28041,8 @@ Force indirect call and jump via register.
+ @opindex mharden-sls
+ Generate code to mitigate against straight line speculation (SLS) with
+ @var{choice}.  The default is @samp{none} which disables all SLS
+-hardening.  @samp{return} enables SLS hardening for function return.
+-@samp{indirect-branch} enables SLS hardening for indirect branch.
++hardening.  @samp{return} enables SLS hardening for function returns.
++@samp{indirect-jmp} enables SLS hardening for indirect jumps.
+ @samp{all} enables all SLS hardening.
+ 
+ @item -mindirect-branch-cs-prefix
+-- 
+2.36.1
+

SOURCES/gcc8-harden-4.patch

@@ -0,0 +1,75 @@
+From 5a5e7890cefa112e95e1de9800d8081c2a38a1da Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 5 Jan 2022 18:04:21 -0800
+Subject: [PATCH 4/4] x86: Generate INT3 for __builtin_eh_return
+
+Generate INT3 after indirect jmp in exception return for -fcf-protection
+with -mharden-sls=indirect-jmp.
+
+gcc/
+
+	PR target/103925
+	* config/i386/i386.c (ix86_output_indirect_function_return):
+	Generate INT3 after indirect jmp for -mharden-sls=indirect-jmp.
+
+gcc/testsuite/
+
+	PR target/103925
+	* gcc.target/i386/harden-sls-6.c: New test.
+
+(cherry picked from commit c2e5c4feed32c808591b5278f680bbabe63eb225)
+---
+ gcc/config/i386/i386.c                       |  9 ++++++---
+ gcc/testsuite/gcc.target/i386/harden-sls-6.c | 18 ++++++++++++++++++
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-6.c
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 3bc14e20105..dbc3d462fda 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -29083,11 +29083,14 @@ ix86_output_indirect_function_return (rtx ret_op)
+ 	}
+       else
+ 	output_indirect_thunk (need_prefix, regno);
+-
+-      return "";
+     }
+   else
+-    return "%!jmp\t%A0";
++    {
++      output_asm_insn ("%!jmp\t%A0", &ret_op);
++      if (ix86_harden_sls & harden_sls_indirect_jmp)
++	fputs ("\tint3\n", asm_out_file);
++    }
++  return "";
+ }
+ 
+ /* Split simple return with popping POPC bytes from stack to indirect
+diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-6.c b/gcc/testsuite/gcc.target/i386/harden-sls-6.c
+new file mode 100644
+index 00000000000..9068eb64008
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/harden-sls-6.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile { target { ! ia32 } } } */
++/* { dg-options "-O2 -fcf-protection -mharden-sls=indirect-jmp" } */
++
++struct _Unwind_Context _Unwind_Resume_or_Rethrow_this_context;
++
++void offset (int);
++
++struct _Unwind_Context {
++  void *reg[7];
++} _Unwind_Resume_or_Rethrow() {
++  struct _Unwind_Context cur_contextcur_context =
++      _Unwind_Resume_or_Rethrow_this_context;
++  offset(0);
++  __builtin_eh_return ((long) offset, 0);
++}
++
++/* { dg-final { scan-assembler "jmp\[ \t\]+\\*%rcx" } } */
++/* { dg-final { scan-assembler-times "int3" 1 } } */
+-- 
+2.36.1
+

SOURCES/gcc8-i386-libgomp.patch

@@ -0,0 +1,11 @@
+--- libgomp/configure.tgt.jj	2008-01-10 20:53:48.000000000 +0100
++++ libgomp/configure.tgt	2008-03-27 12:44:51.000000000 +0100
+@@ -67,7 +67,7 @@ if test $enable_linux_futex = yes; then
+ 	    ;;
+ 	  *)
+ 	    if test -z "$with_arch"; then
+-	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
++	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
+ 	    fi
+ 	esac
+ 	;;

SOURCES/gcc8-isl-dl.patch

@@ -1,15 +1,15 @@
 --- gcc/Makefile.in.jj	2015-06-06 10:00:25.000000000 +0200
 +++ gcc/Makefile.in	2015-11-04 14:56:02.643536437 +0100
-@@ -1063,7 +1063,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
+@@ -1046,7 +1046,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
  # and the system's installed libraries.
  LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
  	$(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS)
 -BACKENDLIBS = $(ISLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
 +BACKENDLIBS = $(if $(ISLLIBS),-ldl) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
- 	$(ZLIB) $(ZSTD_LIB)
+ 	$(ZLIB)
  # Any system libraries needed just for GNAT.
  SYSLIBS = @GNAT_LIBEXC@
-@@ -2302,6 +2302,15 @@ $(out_object_file): $(out_file)
+@@ -2196,6 +2196,15 @@ $(out_object_file): $(out_file)
  $(common_out_object_file): $(common_out_file)
  	$(COMPILE) $<
  	$(POSTCOMPILE)
@@ -27,10 +27,10 @@
  # and compile them.
 --- gcc/graphite.h.jj	2016-01-27 12:44:06.000000000 +0100
 +++ gcc/graphite.h	2016-01-27 13:26:38.309876856 +0100
-@@ -24,6 +24,591 @@ along with GCC; see the file COPYING3.
+@@ -39,6 +39,590 @@ along with GCC; see the file COPYING3.
- 
+ #include <isl/schedule_node.h>
- #include "sese.h"
+ #include <isl/id.h>
- 
+ #include <isl/space.h>
 +#include <isl/version.h>
 +#include <dlfcn.h>
 +
@@ -615,11 +615,10 @@
 +#define isl_version (*isl_pointers__.p_isl_version)
 +#define isl_options_get_on_error (*isl_pointers__.p_isl_options_get_on_error)
 +#define isl_ctx_reset_error (*isl_pointers__.p_isl_ctx_reset_error)
-+
+ 
  typedef struct poly_dr *poly_dr_p;
  
- typedef struct poly_bb *poly_bb_p;
+@@ -461,5 +1045,6 @@ extern void build_scops (vec<scop_p> *);
-@@ -448,5 +1033,6 @@ extern tree cached_scalar_evolution_in_r
  extern void dot_all_sese (FILE *, vec<sese_l> &);
  extern void dot_sese (sese_l &);
  extern void dot_cfg ();

SOURCES/gcc8-libgcc-hardened.patch

@@ -0,0 +1,14 @@
+--- libgcc/config/t-slibgcc.mp	2018-10-03 16:07:00.336990246 -0400
++++ libgcc/config/t-slibgcc	2018-10-03 16:06:26.719946740 -0400
+@@ -30,9 +30,10 @@ SHLIB_LC = -lc
+ SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
+ 	$(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
++SHLIB_EXTRA_LDFLAGS = -Wl,-z,relro  -Wl,-z,now
+ 
+ SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+-	$(SHLIB_LDFLAGS) \
++	$(SHLIB_LDFLAGS) $(SHLIB_EXTRA_LDFLAGS) \
+ 	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \
+ 	$(SHLIB_OBJS) $(SHLIB_LC) && \
+ 	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \

SOURCES/gcc8-libgfortran-default-values.patch

@@ -0,0 +1,516 @@
+diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
+index d93dcfa..f47565c 100644
+--- a/gcc/fortran/io.c
++++ b/gcc/fortran/io.c
+@@ -909,6 +909,13 @@ data_desc:
+ 
+       if (u != FMT_POSINT)
+ 	{
++	  if (flag_dec)
++	    {
++	      /* Assume a default width based on the variable size.  */
++	      saved_token = u;
++	      break;
++	    }
++
+ 	  format_locus.nextc += format_string_pos;
+ 	  gfc_error ("Positive width required in format "
+ 			 "specifier %s at %L", token_to_string (t),
+@@ -1030,6 +1037,13 @@ data_desc:
+ 	goto fail;
+       if (t != FMT_ZERO && t != FMT_POSINT)
+ 	{
++	  if (flag_dec)
++	    {
++	      /* Assume the default width is expected here and continue lexing.  */
++	      value = 0; /* It doesn't matter what we set the value to here.  */
++	      saved_token = t;
++	      break;
++	    }
+ 	  error = nonneg_required;
+ 	  goto syntax;
+ 	}
+@@ -1099,8 +1113,17 @@ data_desc:
+ 	goto fail;
+       if (t != FMT_ZERO && t != FMT_POSINT)
+ 	{
+-	  error = nonneg_required;
+-	  goto syntax;
++	  if (flag_dec)
++	    {
++	      /* Assume the default width is expected here and continue lexing.  */
++	      value = 0; /* It doesn't matter what we set the value to here.  */
++	      saved_token = t;
++	    }
++	  else
++	    {
++	      error = nonneg_required;
++	      goto syntax;
++	    }
+ 	}
+       else if (is_input && t == FMT_ZERO)
+ 	{
+diff --git a/gcc/testsuite/gfortran.dg/fmt_f_default_field_width.f90 b/gcc/testsuite/gfortran.dg/fmt_f_default_field_width.f90
+new file mode 100644
+index 0000000..b087b8f
+--- /dev/null
++++ b/gcc/testsuite/gfortran.dg/fmt_f_default_field_width.f90
+@@ -0,0 +1,43 @@
++! { dg-do run }
++! { dg-options -fdec }
++!
++! Test case for the default field widths enabled by the -fdec-format-defaults flag.
++!
++! This feature is not part of any Fortran standard, but it is supported by the
++! Oracle Fortran compiler and others.
++!
++! libgfortran uses printf() internally to implement FORMAT. If you print float
++! values to a higher precision than the type can actually store, the results
++! are implementation dependent: some platforms print zeros, others print random
++! numbers. Don't depend on this behaviour in tests because they will not be
++! portable.
++
++    character(50) :: buffer
++
++    real*4 :: real_4
++    real*8 :: real_8
++    real*16 :: real_16
++    integer :: len
++
++    real_4 = 4.18
++    write(buffer, '(A, F, A)') ':',real_4,':'
++    print *,buffer
++    if (buffer.ne.":      4.1799998:") call abort
++
++    real_4 = 0.00000018
++    write(buffer, '(A, F, A)') ':',real_4,':'
++    print *,buffer
++    if (buffer.ne.":      0.0000002:") call abort
++
++    real_8 = 4.18
++    write(buffer, '(A, F, A)') ':',real_8,':'
++    print *,buffer
++    len = len_trim(buffer)
++    if (len /= 27) call abort
++
++    real_16 = 4.18
++    write(buffer, '(A, F, A)') ':',real_16,':'
++    print *,buffer
++    len = len_trim(buffer)
++    if (len /= 44) call abort
++end
+diff --git a/gcc/testsuite/gfortran.dg/fmt_g_default_field_width.f90 b/gcc/testsuite/gfortran.dg/fmt_g_default_field_width.f90
+new file mode 100644
+index 0000000..3d3a476
+--- /dev/null
++++ b/gcc/testsuite/gfortran.dg/fmt_g_default_field_width.f90
+@@ -0,0 +1,48 @@
++! { dg-do run }
++! { dg-options -fdec }
++!
++! Test case for the default field widths enabled by the -fdec-format-defaults flag.
++!
++! This feature is not part of any Fortran standard, but it is supported by the
++! Oracle Fortran compiler and others.
++!
++! libgfortran uses printf() internally to implement FORMAT. If you print float
++! values to a higher precision than the type can actually store, the results
++! are implementation dependent: some platforms print zeros, others print random
++! numbers. Don't depend on this behaviour in tests because they will not be
++! portable.
++
++    character(50) :: buffer
++
++    real*4 :: real_4
++    real*8 :: real_8
++    real*16 :: real_16
++    integer :: len
++
++    real_4 = 4.18
++    write(buffer, '(A, G, A)') ':',real_4,':'
++    print *,buffer
++    if (buffer.ne.":   4.180000    :") call abort
++
++    real_4 = 0.00000018
++    write(buffer, '(A, G, A)') ':',real_4,':'
++    print *,buffer
++    if (buffer.ne.":  0.1800000E-06:") call abort
++
++    real_4 = 18000000.4
++    write(buffer, '(A, G, A)') ':',real_4,':'
++    print *,buffer
++    if (buffer.ne.":  0.1800000E+08:") call abort
++
++    real_8 = 4.18
++    write(buffer, '(A, G, A)') ':',real_8,':'
++    print *,buffer
++    len = len_trim(buffer)
++    if (len /= 27) call abort
++
++    real_16 = 4.18
++    write(buffer, '(A, G, A)') ':',real_16,':'
++    print *,buffer
++    len = len_trim(buffer)
++    if (len /= 44) call abort
++end
+diff --git a/gcc/testsuite/gfortran.dg/fmt_i_default_field_width.f90 b/gcc/testsuite/gfortran.dg/fmt_i_default_field_width.f90
+new file mode 100644
+index 0000000..ac4e165
+--- /dev/null
++++ b/gcc/testsuite/gfortran.dg/fmt_i_default_field_width.f90
+@@ -0,0 +1,38 @@
++! { dg-do run }
++! { dg-options -fdec }
++!
++! Test case for the default field widths enabled by the -fdec-format-defaults flag.
++!
++! This feature is not part of any Fortran standard, but it is supported by the
++! Oracle Fortran compiler and others.
++
++    character(50) :: buffer
++    character(1) :: colon
++
++    integer*2 :: integer_2
++    integer*4 :: integer_4
++    integer*8 :: integer_8
++
++    write(buffer, '(A, I, A)') ':',12340,':'
++    print *,buffer
++    if (buffer.ne.":       12340:") call abort
++
++    read(buffer, '(A1, I, A1)') colon, integer_4, colon
++    if (integer_4.ne.12340) call abort
++
++    integer_2 = -99
++    write(buffer, '(A, I, A)') ':',integer_2,':'
++    print *,buffer
++    if (buffer.ne.":    -99:") call abort
++
++    integer_8 = -11112222
++    write(buffer, '(A, I, A)') ':',integer_8,':'
++    print *,buffer
++    if (buffer.ne.":              -11112222:") call abort
++
++! If the width is 7 and there are 7 leading zeroes, the result should be zero.
++    integer_2 = 789
++    buffer = '0000000789'
++    read(buffer, '(I)') integer_2
++    if (integer_2.ne.0) call abort
++end
+diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
+index c2abdd7..692b1ff 100644
+--- a/libgfortran/io/format.c
++++ b/libgfortran/io/format.c
+@@ -956,12 +956,33 @@ parse_format_list (st_parameter_dt *dtp, bool *seen_dd)
+ 	  *seen_dd = true;
+ 	  if (u != FMT_POSINT && u != FMT_ZERO)
+ 	    {
++	      if (dtp->common.flags & IOPARM_DT_DEC_EXT)
++		{
++		  tail->u.real.w = DEFAULT_WIDTH;
++		  tail->u.real.d = 0;
++		  tail->u.real.e = -1;
++		  fmt->saved_token = u;
++		  break;
++		}
+ 	      fmt->error = nonneg_required;
+ 	      goto finished;
+ 	    }
+ 	}
++      else if (u == FMT_ZERO)
++	{
++	  fmt->error = posint_required;
++	  goto finished;
++	}
+       else if (u != FMT_POSINT)
+ 	{
++	  if (dtp->common.flags & IOPARM_DT_DEC_EXT)
++	    {
++	      tail->u.real.w = DEFAULT_WIDTH;
++	      tail->u.real.d = 0;
++	      tail->u.real.e = -1;
++	      fmt->saved_token = u;
++	      break;
++	    }
+ 	  fmt->error = posint_required;
+ 	  goto finished;
+ 	}
+@@ -1099,6 +1120,13 @@ parse_format_list (st_parameter_dt *dtp, bool *seen_dd)
+ 	{
+ 	  if (t != FMT_POSINT)
+ 	    {
++	      if (dtp->common.flags & IOPARM_DT_DEC_EXT)
++		{
++		  tail->u.integer.w = DEFAULT_WIDTH;
++		  tail->u.integer.m = -1;
++		  fmt->saved_token = t;
++		  break;
++		}
+ 	      fmt->error = posint_required;
+ 	      goto finished;
+ 	    }
+@@ -1107,6 +1135,13 @@ parse_format_list (st_parameter_dt *dtp, bool *seen_dd)
+ 	{
+ 	  if (t != FMT_ZERO && t != FMT_POSINT)
+ 	    {
++	      if (dtp->common.flags & IOPARM_DT_DEC_EXT)
++		{
++		  tail->u.integer.w = DEFAULT_WIDTH;
++		  tail->u.integer.m = -1;
++		  fmt->saved_token = t;
++		  break;
++		}
+ 	      fmt->error = nonneg_required;
+ 	      goto finished;
+ 	    }
+diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
+index 5583183..d1d08e8 100644
+--- a/libgfortran/io/io.h
++++ b/libgfortran/io/io.h
+@@ -981,5 +981,55 @@ memset4 (gfc_char4_t *p, gfc_char4_t c, int k)
+     *p++ = c;
+ }
+ 
++/* Used in width fields to indicate that the default should be used */
++#define DEFAULT_WIDTH -1
++
++/* Defaults for certain format field descriptors. These are decided based on
++ * the type of the value being formatted.
++ *
++ * The behaviour here is modelled on the Oracle Fortran compiler. At the time
++ * of writing, the details were available at this URL:
++ *
++ *   https://docs.oracle.com/cd/E19957-01/805-4939/6j4m0vnc3/index.html#z4000743746d
++ */
++
++static inline int
++default_width_for_integer (int kind)
++{
++  switch (kind)
++    {
++    case 1:
++    case 2:  return  7;
++    case 4:  return 12;
++    case 8:  return 23;
++    case 16: return 44;
++    default: return  0;
++    }
++}
++
++static inline int
++default_width_for_float (int kind)
++{
++  switch (kind)
++    {
++    case 4:  return 15;
++    case 8:  return 25;
++    case 16: return 42;
++    default: return  0;
++    }
++}
++
++static inline int
++default_precision_for_float (int kind)
++{
++  switch (kind)
++    {
++    case 4:  return 7;
++    case 8:  return 16;
++    case 16: return 33;
++    default: return 0;
++    }
++}
++
+ #endif
+ 
+diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c
+index 2c9de48..e911e35 100644
+--- a/libgfortran/io/read.c
++++ b/libgfortran/io/read.c
+@@ -629,6 +629,12 @@ read_decimal (st_parameter_dt *dtp, const fnode *f, char *dest, int length)
+ 
+   w = f->u.w;
+ 
++  /* This is a legacy extension, and the frontend will only allow such cases
++   * through when -fdec-format-defaults is passed.
++   */
++  if (w == DEFAULT_WIDTH)
++    w = default_width_for_integer (length);
++
+   p = read_block_form (dtp, &w);
+ 
+   if (p == NULL)
+diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c
+index a7307a8..c8e52fb 100644
+--- a/libgfortran/io/write.c
++++ b/libgfortran/io/write.c
+@@ -684,9 +684,8 @@ write_l (st_parameter_dt *dtp, const fnode *f, char *source, int len)
+   p[wlen - 1] = (n) ? 'T' : 'F';
+ }
+ 
+-
+ static void
+-write_boz (st_parameter_dt *dtp, const fnode *f, const char *q, int n)
++write_boz (st_parameter_dt *dtp, const fnode *f, const char *q, int n, int len)
+ {
+   int w, m, digits, nzero, nblank;
+   char *p;
+@@ -719,6 +718,9 @@ write_boz (st_parameter_dt *dtp, const fnode *f, const char *q, int n)
+   /* Select a width if none was specified.  The idea here is to always
+      print something.  */
+ 
++  if (w == DEFAULT_WIDTH)
++    w = default_width_for_integer (len);
++
+   if (w == 0)
+     w = ((digits < m) ? m : digits);
+ 
+@@ -845,6 +847,8 @@ write_decimal (st_parameter_dt *dtp, const fnode *f, const char *source,
+ 
+   /* Select a width if none was specified.  The idea here is to always
+      print something.  */
++  if (w == DEFAULT_WIDTH)
++    w = default_width_for_integer (len);
+ 
+   if (w == 0)
+     w = ((digits < m) ? m : digits) + nsign;
+@@ -1187,13 +1191,13 @@ write_b (st_parameter_dt *dtp, const fnode *f, const char *source, int len)
+   if (len > (int) sizeof (GFC_UINTEGER_LARGEST))
+     {
+       p = btoa_big (source, itoa_buf, len, &n);
+-      write_boz (dtp, f, p, n);
++      write_boz (dtp, f, p, n, len);
+     }
+   else
+     {
+       n = extract_uint (source, len);
+       p = btoa (n, itoa_buf, sizeof (itoa_buf));
+-      write_boz (dtp, f, p, n);
++      write_boz (dtp, f, p, n, len);
+     }
+ }
+ 
+@@ -1208,13 +1212,13 @@ write_o (st_parameter_dt *dtp, const fnode *f, const char *source, int len)
+   if (len > (int) sizeof (GFC_UINTEGER_LARGEST))
+     {
+       p = otoa_big (source, itoa_buf, len, &n);
+-      write_boz (dtp, f, p, n);
++      write_boz (dtp, f, p, n, len);
+     }
+   else
+     {
+       n = extract_uint (source, len);
+       p = otoa (n, itoa_buf, sizeof (itoa_buf));
+-      write_boz (dtp, f, p, n);
++      write_boz (dtp, f, p, n, len);
+     }
+ }
+ 
+@@ -1228,13 +1232,13 @@ write_z (st_parameter_dt *dtp, const fnode *f, const char *source, int len)
+   if (len > (int) sizeof (GFC_UINTEGER_LARGEST))
+     {
+       p = ztoa_big (source, itoa_buf, len, &n);
+-      write_boz (dtp, f, p, n);
++      write_boz (dtp, f, p, n, len);
+     }
+   else
+     {
+       n = extract_uint (source, len);
+       p = gfc_xtoa (n, itoa_buf, sizeof (itoa_buf));
+-      write_boz (dtp, f, p, n);
++      write_boz (dtp, f, p, n, len);
+     }
+ }
+ 
+@@ -1504,7 +1508,7 @@ size_from_kind (st_parameter_dt *dtp, const fnode *f, int kind)
+ {
+   int size;
+ 
+-  if (f->format == FMT_F && f->u.real.w == 0)
++  if ((f->format == FMT_F && f->u.real.w == 0) || f->u.real.w == DEFAULT_WIDTH)
+     {
+       switch (kind)
+       {
+diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def
+index 7f0aa1d..73dc910 100644
+--- a/libgfortran/io/write_float.def
++++ b/libgfortran/io/write_float.def
+@@ -113,7 +113,8 @@ determine_precision (st_parameter_dt * d
+ static void
+ build_float_string (st_parameter_dt *dtp, const fnode *f, char *buffer,
+ 		    size_t size, int nprinted, int precision, int sign_bit,
+-		    bool zero_flag, int npad, char *result, size_t *len)
++		    bool zero_flag, int npad, int default_width, char *result,
++                    size_t *len)
+ {
+   char *put;
+   char *digits;
+@@ -132,8 +133,17 @@ build_float_string (st_parameter_dt *dtp
+   sign_t sign;
+ 
+   ft = f->format;
+-  w = f->u.real.w;
+-  d = f->u.real.d;
++  if (f->u.real.w == DEFAULT_WIDTH)
++    /* This codepath can only be reached with -fdec-format-defaults. */
++    {
++      w = default_width;
++      d = precision;
++    }
++  else
++    {
++      w = f->u.real.w;
++      d = f->u.real.d;
++    }
+   p = dtp->u.p.scale_factor;
+   *len = 0;
+ 
+@@ -959,6 +969,11 @@ determine_en_precision (st_parameter_dt
+       int save_scale_factor;\
+       volatile GFC_REAL_ ## x temp;\
+       save_scale_factor = dtp->u.p.scale_factor;\
++      if (w == DEFAULT_WIDTH)\
++	{\
++	  w = default_width;\
++	  d = precision;\
++	}\
+       switch (dtp->u.p.current_unit->round_status)\
+ 	{\
+ 	  case ROUND_ZERO:\
+@@ -1034,7 +1049,8 @@ determine_en_precision (st_parameter_dt
+ 	  nprinted = FDTOA(y,precision,m);\
+ 	}\
+       build_float_string (dtp, &newf, buffer, size, nprinted, precision,\
+-				   sign_bit, zero_flag, npad, result, res_len);\
++				   sign_bit, zero_flag, npad, default_width,\
++				   result, res_len);\
+       dtp->u.p.scale_factor = save_scale_factor;\
+     }\
+   else\
+@@ -1044,7 +1060,8 @@ determine_en_precision (st_parameter_dt
+       else\
+ 	nprinted = DTOA(y,precision,m);\
+       build_float_string (dtp, f, buffer, size, nprinted, precision,\
+-				   sign_bit, zero_flag, npad, result, res_len);\
++				   sign_bit, zero_flag, npad, default_width,\
++				   result, res_len);\
+     }\
+ }\
+ 
+@@ -1058,6 +1075,16 @@ get_float_string (st_parameter_dt *dtp,
+ {
+   int sign_bit, nprinted;
+   bool zero_flag;
++  int default_width = 0;
++
++  if (f->u.real.w == DEFAULT_WIDTH)
++    /* This codepath can only be reached with -fdec-format-defaults. The default
++     * values are based on those used in the Oracle Fortran compiler.
++     */
++    {
++      default_width = default_width_for_float (kind);
++      precision = default_precision_for_float (kind);
++    }
+ 
+   switch (kind)
+     {

SOURCES/gcc8-libgomp-testsuite.patch

@@ -0,0 +1,41 @@
+--- libgomp/testsuite/libgomp-test-support.exp.in.jj	2018-04-25 09:40:31.323655308 +0200
++++ libgomp/testsuite/libgomp-test-support.exp.in	2019-04-25 20:01:50.028243827 +0200
+@@ -2,4 +2,5 @@ set cuda_driver_include "@CUDA_DRIVER_IN
+ set cuda_driver_lib "@CUDA_DRIVER_LIB@"
+ set hsa_runtime_lib "@HSA_RUNTIME_LIB@"
+ 
++set offload_plugins "@offload_plugins@"
+ set offload_targets "@offload_targets@"
+--- libgomp/testsuite/lib/libgomp.exp.jj	2018-04-25 09:40:31.584655429 +0200
++++ libgomp/testsuite/lib/libgomp.exp	2019-05-24 11:41:51.015822702 +0200
+@@ -40,7 +40,7 @@ load_file libgomp-test-support.exp
+ # Populate offload_targets_s (offloading targets separated by a space), and
+ # offload_targets_s_openacc (the same, but with OpenACC names; OpenACC spells
+ # some of them a little differently).
+-set offload_targets_s [split $offload_targets ","]
++set offload_targets_s [split $offload_plugins ","]
+ set offload_targets_s_openacc {}
+ foreach offload_target_openacc $offload_targets_s {
+     # Translate to OpenACC names, or skip if not yet supported.
+@@ -137,8 +137,8 @@ proc libgomp_init { args } {
+ 
+     # Add liboffloadmic build directory in LD_LIBRARY_PATH to support
+     # non-fallback testing for Intel MIC targets
+-    global offload_targets
+-    if { [string match "*,intelmic,*" ",$offload_targets,"] } {
++    global offload_plugins
++    if { [string match "*,intelmic,*" ",$offload_plugins,"] } {
+ 	append always_ld_library_path ":${blddir}/../liboffloadmic/.libs"
+ 	append always_ld_library_path ":${blddir}/../liboffloadmic/plugin/.libs"
+ 	# libstdc++ is required by liboffloadmic
+@@ -362,8 +362,8 @@ proc check_effective_target_offload_devi
+ # Return 1 if configured for nvptx offloading.
+ 
+ proc check_effective_target_openacc_nvidia_accel_configured { } {
+-    global offload_targets
+-    if { ![string match "*,nvptx,*" ",$offload_targets,"] } {
++    global offload_plugins
++    if { ![string match "*,nvptx,*" ",$offload_plugins,"] } {
+         return 0
+     }
+     # PR libgomp/65099: Currently, we only support offloading in 64-bit

SOURCES/gcc8-libstdc++-docs.patch

@@ -4,7 +4,7 @@
        <a class="link" href="https://www.fsf.org" target="_top">FSF
        </a>
      </p><p>
-+      Release 11.5.0
++      Release 8.5.0
 +    </p><p>
        Permission is granted to copy, distribute and/or modify this
        document under the terms of the GNU Free Documentation
@@ -17,7 +17,7 @@
  </p><p>
 -  The API documentation, rendered into HTML, can be viewed online
 +  The API documentation, rendered into HTML, can be viewed locally
-+  <a class="link" href="api/index.html" target="_top">for the 11.5.0 release</a>,
++  <a class="link" href="api/index.html" target="_top">for the 8.5.0 release</a>,
 +  online
    <a class="link" href="http://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
    and

SOURCES/gcc8-libstdc++-make_shared.patch

@@ -0,0 +1,61 @@
+commit 79fa567e234585dc6a71f9bd069101c993513f3e
+Author: Jonathan Wakely <jwakely@redhat.com>
+Date:   Thu Apr 22 15:46:51 2021 +0100
+
+    libstdc++: Reject std::make_shared<T[]> [PR 99006]
+    
+    Prior to C++20 it should be ill-formed to use std::make_shared with an
+    array type (and we don't support the C++20 feature to make it valid yet
+    anyway).
+    
+    libstdc++-v3/ChangeLog:
+    
+            PR libstdc++/99006
+            * include/bits/shared_ptr.h (allocate_shared): Assert that _Tp
+            is not an array type.
+            * include/bits/shared_ptr_base.h (__allocate_shared): Likewise.
+            * testsuite/20_util/shared_ptr/creation/99006.cc: New test.
+    
+    (cherry picked from commit 55650236cd97d81f42f9fdb4f6bcb12babafe51f)
+
+diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h
+index 281600b2901..4ddc52ae723 100644
+--- a/libstdc++-v3/include/bits/shared_ptr.h
++++ b/libstdc++-v3/include/bits/shared_ptr.h
+@@ -698,6 +698,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     inline shared_ptr<_Tp>
+     allocate_shared(const _Alloc& __a, _Args&&... __args)
+     {
++      static_assert(!is_array<_Tp>::value, "make_shared<T[]> not supported");
++
+       return shared_ptr<_Tp>(_Sp_alloc_shared_tag<_Alloc>{__a},
+ 			     std::forward<_Args>(__args)...);
+     }
+diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
+index 0367c2d51a5..8af6e9fb11c 100644
+--- a/libstdc++-v3/include/bits/shared_ptr_base.h
++++ b/libstdc++-v3/include/bits/shared_ptr_base.h
+@@ -1822,6 +1822,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     inline __shared_ptr<_Tp, _Lp>
+     __allocate_shared(const _Alloc& __a, _Args&&... __args)
+     {
++      static_assert(!is_array<_Tp>::value, "make_shared<T[]> not supported");
++
+       return __shared_ptr<_Tp, _Lp>(_Sp_alloc_shared_tag<_Alloc>{__a},
+ 				    std::forward<_Args>(__args)...);
+     }
+diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc
+new file mode 100644
+index 00000000000..d5f7a5da5e9
+--- /dev/null
++++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc
+@@ -0,0 +1,9 @@
++// FIXME: This should use { target { ! c++20 } }
++// { dg-do compile }
++
++#include <memory>
++
++auto p = std::make_shared<int[]>(2); // { dg-error "here" }
++auto q = std::make_shared<int[2]>(1, 2); // { dg-error "here" }
++
++// { dg-prune-output "static assertion failed" }

SOURCES/gcc8-mcet.patch

@@ -0,0 +1,17 @@
+2018-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/i386/i386.opt (mcet): Remporarily re-add as alias to -mshstk.
+
+--- gcc/config/i386/i386.opt	(revision 259613)
++++ gcc/config/i386/i386.opt	(revision 259612)
+@@ -1006,6 +1006,10 @@ mgeneral-regs-only
+ Target Report RejectNegative Mask(GENERAL_REGS_ONLY) Var(ix86_target_flags) Save
+ Generate code which uses only the general registers.
+ 
++mcet
++Target Undocumented Alias(mshstk)
++;; Deprecated
++
+ mshstk
+ Target Report Mask(ISA_SHSTK) Var(ix86_isa_flags) Save
+ Enable shadow stack built-in functions from Control-flow Enforcement

SOURCES/gcc8-no-add-needed.patch

@@ -1,6 +1,8 @@
 2010-02-08  Roland McGrath  <roland@redhat.com>
 
-	* config/gnu-user.h (LINK_EH_SPEC): Pass --no-add-needed to the linker.
+	* config/rs6000/sysv4.h (LINK_EH_SPEC): Pass --no-add-needed to the
+	linker.
+	* config/gnu-user.h (LINK_EH_SPEC): Likewise.
 	* config/alpha/elf.h (LINK_EH_SPEC): Likewise.
 	* config/ia64/linux.h (LINK_EH_SPEC): Likewise.
 
@@ -26,7 +28,7 @@
  #define TARGET_INIT_LIBFUNCS ia64_soft_fp_init_libfuncs
 --- gcc/config/gnu-user.h.jj	2011-01-03 12:53:03.739057299 +0100
 +++ gcc/config/gnu-user.h	2011-01-04 18:14:10.932814884 +0100
-@@ -106,7 +106,7 @@ see the files COPYING3 and COPYING.RUNTI
+@@ -133,7 +133,7 @@ see the files COPYING3 and COPYING.RUNTI
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -34,4 +36,15 @@
 +#define LINK_EH_SPEC "--no-add-needed %{!static|static-pie:--eh-frame-hdr} "
  #endif
  
- #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+--- gcc/config/rs6000/sysv4.h.jj	2011-01-03 13:02:18.255994215 +0100
++++ gcc/config/rs6000/sysv4.h	2011-01-04 18:14:10.933888871 +0100
+@@ -816,7 +816,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
+ 
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+-# define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
++# define LINK_EH_SPEC "--no-add-needed %{!static|static-pie:--eh-frame-hdr} "
+ #endif
+ 
+ #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \

SOURCES/gcc8-pch-tweaks.patch

@@ -1,37 +1,3 @@
-This patch backports support for PCH with PIE from upstream trunk.
-
-It squashes two commits:
-
-commit e4641191287ca613529d78a906afe4f029c1c3cd
-Author: Iain Sandoe <iain@sandoe.co.uk>
-Date:   Sat Nov 13 12:26:16 2021 +0000
-
-    PCH: Make the save and restore diagnostics more robust.
-    
-    When saving, if we cannot obtain a suitable memory segment there
-    is no point in continuing, so exit with an error.
-    
-    When reading in the PCH, we have a situation that the read-in
-    data will replace the line tables used by the diagnostics output.
-    However, the state of the read-oin line tables is indeterminate
-    at some points where diagnostics might be needed.
-    
-    To make this more robust, we save the existing line tables at
-    the start and, once we have read in the pointer to the new one,
-    put that to one side and restore the original table.  This
-    avoids compiler hangs if the read or memory acquisition code
-    issues an assert, fatal_error, segv etc.
-    
-    Once the read is complete, we swap in the new line table that
-    came from the PCH.
-    
-    If the read-in PCH is corrupted then we still have a broken
-    compilation w.r.t any future diagnostics - but there is little
-    that can be done about that without more careful validation of
-    the file.
-    
-and
-
 commit fe7c3ecff1f9c0520090a77fa824d8c5d9dbec12
 Author: Jakub Jelinek <jakub@redhat.com>
 Date:   Fri Dec 3 11:03:30 2021 +0100
@@ -63,11 +29,110 @@ Date:   Fri Dec 3 11:03:30 2021 +0100
     there isn't really any extra work on the load side except freading two scalar
     values and fseek.
     
+    2021-12-03  Jakub Jelinek  <jakub@redhat.com>
+    
+            PR pch/71934
+    gcc/
+            * ggc.h (gt_pch_note_callback): Declare.
+            * gengtype.h (enum typekind): Add TYPE_CALLBACK.
+            (callback_type): Declare.
+            * gengtype.c (dbgprint_count_type_at): Handle TYPE_CALLBACK.
+            (callback_type): New variable.
+            (process_gc_options): Add CALLBACK argument, handle callback
+            option.
+            (set_gc_used_type): Adjust process_gc_options caller, if callback,
+            set type to &callback_type.
+            (output_mangled_typename): Handle TYPE_CALLBACK.
+            (walk_type): Likewise.  Handle callback option.
+            (write_types_process_field): Handle TYPE_CALLBACK.
+            (write_types_local_user_process_field): Likewise.
+            (write_types_local_process_field): Likewise.
+            (write_root): Likewise.
+            (dump_typekind): Likewise.
+            (dump_type): Likewise.
+            * gengtype-state.c (type_lineloc): Handle TYPE_CALLBACK.
+            (state_writer::write_state_callback_type): New method.
+            (state_writer::write_state_type): Handle TYPE_CALLBACK.
+            (read_state_callback_type): New function.
+            (read_state_type): Handle TYPE_CALLBACK.
+            * ggc-common.c (callback_vec): New variable.
+            (gt_pch_note_callback): New function.
+            (gt_pch_save): Stream out gt_pch_save function address and relocation
+            table.
+            (gt_pch_restore): Stream in saved gt_pch_save function address and
+            relocation table and apply relocations if needed.
+            * doc/gty.texi (callback): Document new GTY option.
+            * varasm.c (get_unnamed_section): Change callback argument's type and
+            last argument's type from const void * to const char *.
+            (output_section_asm_op): Change argument's type from const void *
+            to const char *, remove unnecessary cast.
+            * tree-core.h (struct tree_translation_unit_decl): Drop GTY((skip))
+            from language member.
+            * output.h (unnamed_section_callback): Change argument type from
+            const void * to const char *.
+            (struct unnamed_section): Use GTY((callback)) instead of GTY((skip))
+            for callback member.  Change data member type from const void *
+            to const char *.
+            (struct noswitch_section): Use GTY((callback)) instead of GTY((skip))
+            for callback member.
+            (get_unnamed_section): Change callback argument's type and
+            last argument's type from const void * to const char *.
+            (output_section_asm_op): Change argument's type from const void *
+            to const char *.
+            * config/avr/avr.c (avr_output_progmem_section_asm_op): Likewise.
+            Remove unneeded cast.
+            * config/darwin.c (output_objc_section_asm_op): Change argument's type
+            from const void * to const char *.
+            * config/pa/pa.c (som_output_text_section_asm_op): Likewise.
+            (som_output_comdat_data_section_asm_op): Likewise.
+            * config/rs6000/rs6000.c (rs6000_elf_output_toc_section_asm_op):
+            Likewise.
+            (rs6000_xcoff_output_readonly_section_asm_op): Likewise.  Instead
+            of dereferencing directive hardcode variable names and decide based on
+            whether directive is NULL or not.
+            (rs6000_xcoff_output_readwrite_section_asm_op): Change argument's type
+            from const void * to const char *.
+            (rs6000_xcoff_output_tls_section_asm_op): Likewise.  Instead
+            of dereferencing directive hardcode variable names and decide based on
+            whether directive is NULL or not.
+            (rs6000_xcoff_output_toc_section_asm_op): Change argument's type
+            from const void * to const char *.
+            (rs6000_xcoff_asm_init_sections): Adjust get_unnamed_section callers.
+    gcc/c-family/
+            * c-pch.c (struct c_pch_validity): Remove pch_init member.
+            (pch_init): Don't initialize v.pch_init.
+            (c_common_valid_pch): Don't warn and punt if .text addresses change.
+    libcpp/
+            * include/line-map.h (class line_maps): Add GTY((callback)) to
+            reallocator and round_alloc_size members.
+
+commit 4dc6d19222581c77a174d44d97507d234fb7e39b
+Author: Jakub Jelinek <jakub@redhat.com>
+Date:   Mon Dec 6 11:18:58 2021 +0100
+
+    avr: Fix AVR build [PR71934]
+    
+    On Mon, Dec 06, 2021 at 11:00:30AM +0100, Martin Liška wrote:
+    > Jakub, I think the patch broke avr-linux target:
+    >
+    > g++  -fno-PIE -c   -g   -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE   -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wno-erro
+    > /home/marxin/Programming/gcc/gcc/config/avr/avr.c: In function ‘void avr_output_data_section_asm_op(const void*)’:
+    > /home/marxin/Programming/gcc/gcc/config/avr/avr.c:10097:26: error: invalid conversion from ‘const void*’ to ‘const char*’ [-fpermissive]
+    
+    This patch fixes that.
+    
+    2021-12-06  Jakub Jelinek  <jakub@redhat.com>
+    
+            PR pch/71934
+            * config/avr/avr.c (avr_output_data_section_asm_op,
+            avr_output_bss_section_asm_op): Change argument type from const void *
+            to const char *.
+
 diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c
-index fd94c3799ac..eebfa1df0bc 100644
+index 5da60423354..2cafa1387bb 100644
 --- a/gcc/c-family/c-pch.c
 +++ b/gcc/c-family/c-pch.c
-@@ -54,7 +54,6 @@ struct c_pch_validity
+@@ -58,7 +58,6 @@ struct c_pch_validity
  {
    unsigned char debug_info_type;
    signed char match[MATCH_SIZE];
@@ -75,7 +140,7 @@ index fd94c3799ac..eebfa1df0bc 100644
    size_t target_data_length;
  };
  
-@@ -117,7 +116,6 @@ pch_init (void)
+@@ -123,7 +122,6 @@ pch_init (void)
  	gcc_assert (v.match[i] == *pch_matching[i].flag_var);
        }
    }
@@ -83,7 +148,7 @@ index fd94c3799ac..eebfa1df0bc 100644
    target_validity = targetm.get_pch_validity (&v.target_data_length);
  
    if (fwrite (partial_pch, IDENT_LENGTH, 1, f) != 1
-@@ -275,19 +273,6 @@ c_common_valid_pch (cpp_reader *pfile, const char *name, int fd)
+@@ -287,20 +285,6 @@ c_common_valid_pch (cpp_reader *pfile, c
  	}
    }
  
@@ -95,7 +160,8 @@ index fd94c3799ac..eebfa1df0bc 100644
 -     check one function.  */
 -  if (v.pch_init != &pch_init)
 -    {
--      cpp_warning (pfile, CPP_W_INVALID_PCH,
+-      if (cpp_get_options (pfile)->warn_invalid_pch)
+-	cpp_error (pfile, CPP_DL_WARNING,
 -		   "%s: had text segment at different address", name);
 -      return 2;
 -    }
@@ -104,10 +170,10 @@ index fd94c3799ac..eebfa1df0bc 100644
    {
      void *this_file_data = xmalloc (v.target_data_length);
 diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
-index 3a250dfb960..4d29e80dcc9 100644
+index 200701a583c..6ba038881d6 100644
 --- a/gcc/config/avr/avr.c
 +++ b/gcc/config/avr/avr.c
-@@ -10221,10 +10221,9 @@ avr_output_bss_section_asm_op (const void *data)
+@@ -10114,10 +10114,9 @@ avr_output_bss_section_asm_op (const void *data)
  /* Unnamed section callback for progmem*.data sections.  */
  
  static void
@@ -121,10 +187,10 @@ index 3a250dfb960..4d29e80dcc9 100644
  
  
 diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
-index 5d173919ee0..0c8aea148dc 100644
+index c5ba7927ce1..8ad5b26c980 100644
 --- a/gcc/config/darwin.c
 +++ b/gcc/config/darwin.c
-@@ -128,7 +128,7 @@ int emit_aligned_common = false;
+@@ -134,7 +134,7 @@ int emit_aligned_common = false;
     DIRECTIVE is as for output_section_asm_op.  */
  
  static void
@@ -134,10 +200,10 @@ index 5d173919ee0..0c8aea148dc 100644
    static bool been_here = false;
  
 diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
-index 341c5f0d765..8ac9c4b3a44 100644
+index f22d25a4066..2b10ef34061 100644
 --- a/gcc/config/pa/pa.c
 +++ b/gcc/config/pa/pa.c
-@@ -10011,7 +10011,7 @@ pa_arg_partial_bytes (cumulative_args_t cum_v, const function_arg_info &arg)
+@@ -10009,7 +10009,7 @@ pa_arg_partial_bytes (cumulative_args_t cum_v, const function_arg_info &arg)
     to the default text subspace.  */
  
  static void
@@ -146,7 +212,7 @@ index 341c5f0d765..8ac9c4b3a44 100644
  {
    gcc_assert (TARGET_SOM);
    if (TARGET_GAS)
-@@ -10055,7 +10055,7 @@ som_output_text_section_asm_op (const void *data ATTRIBUTE_UNUSED)
+@@ -10053,7 +10053,7 @@ som_output_text_section_asm_op (const void *data ATTRIBUTE_UNUSED)
     sections.  This function is only used with SOM.  */
  
  static void
@@ -156,10 +222,10 @@ index 341c5f0d765..8ac9c4b3a44 100644
    in_section = NULL;
    output_section_asm_op (data);
 diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
-index 9b1c3a8b5ea..fa245a8714c 100644
+index 945157b1c1a..34089743759 100644
 --- a/gcc/config/rs6000/rs6000.c
 +++ b/gcc/config/rs6000/rs6000.c
-@@ -20232,7 +20232,7 @@ rs6000_ms_bitfield_layout_p (const_tree record_type)
+@@ -20599,7 +20599,7 @@ rs6000_ms_bitfield_layout_p (const_tree record_type)
  /* A get_unnamed_section callback, used for switching to toc_section.  */
  
  static void
@@ -168,7 +234,7 @@ index 9b1c3a8b5ea..fa245a8714c 100644
  {
    if ((DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_ELFv2)
        && TARGET_MINIMAL_TOC)
-@@ -20936,35 +20936,39 @@ rs6000_xcoff_asm_globalize_label (FILE *stream, const char *name)
+@@ -21303,35 +21303,39 @@ rs6000_xcoff_asm_globalize_label (FILE *stream, const char *name)
     points to the section string variable.  */
  
  static void
@@ -215,7 +281,7 @@ index 9b1c3a8b5ea..fa245a8714c 100644
  {
    if (TARGET_MINIMAL_TOC)
      {
-@@ -20991,26 +20995,26 @@ rs6000_xcoff_asm_init_sections (void)
+@@ -21358,26 +21362,26 @@ rs6000_xcoff_asm_init_sections (void)
  {
    read_only_data_section
      = get_unnamed_section (0, rs6000_xcoff_output_readonly_section_asm_op,
@@ -248,10 +314,10 @@ index 9b1c3a8b5ea..fa245a8714c 100644
    toc_section
      = get_unnamed_section (0, rs6000_xcoff_output_toc_section_asm_op, NULL);
 diff --git a/gcc/doc/gty.texi b/gcc/doc/gty.texi
-index aaf97ae9ad5..0154bd86fe9 100644
+index b996ff2c44e..ca2c8404894 100644
 --- a/gcc/doc/gty.texi
 +++ b/gcc/doc/gty.texi
-@@ -197,6 +197,15 @@ If @code{skip} is applied to a field, the type machinery will ignore it.
+@@ -205,6 +205,15 @@ If @code{skip} is applied to a field, the type machinery will ignore it.
  This is somewhat dangerous; the only safe use is in a union when one
  field really isn't ever used.
  
@@ -268,7 +334,7 @@ index aaf97ae9ad5..0154bd86fe9 100644
  @item for_user
  
 diff --git a/gcc/gengtype-state.c b/gcc/gengtype-state.c
-index 891f2e18a61..fb99729bc0e 100644
+index ac9d536963f..36a96e84574 100644
 --- a/gcc/gengtype-state.c
 +++ b/gcc/gengtype-state.c
 @@ -57,6 +57,7 @@ type_lineloc (const_type_p ty)
@@ -346,10 +412,10 @@ index 891f2e18a61..fb99729bc0e 100644
  	    {
  	      *current = XCNEW (struct type);
 diff --git a/gcc/gengtype.c b/gcc/gengtype.c
-index 98d4626f87e..91eacc26932 100644
+index a77cfd92bfa..b9daaa43689 100644
 --- a/gcc/gengtype.c
 +++ b/gcc/gengtype.c
-@@ -167,6 +167,7 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
+@@ -172,6 +172,7 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
    int nb_struct = 0, nb_union = 0, nb_array = 0, nb_pointer = 0;
    int nb_lang_struct = 0;
    int nb_user_struct = 0, nb_undefined = 0;
@@ -357,7 +423,7 @@ index 98d4626f87e..91eacc26932 100644
    type_p p = NULL;
    for (p = t; p; p = p->next)
      {
-@@ -197,6 +198,9 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
+@@ -202,6 +203,9 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
  	case TYPE_ARRAY:
  	  nb_array++;
  	  break;
@@ -367,7 +433,7 @@ index 98d4626f87e..91eacc26932 100644
  	case TYPE_LANG_STRUCT:
  	  nb_lang_struct++;
  	  break;
-@@ -212,6 +216,8 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
+@@ -217,6 +221,8 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
      fprintf (stderr, "@@%%@@ %d structs, %d unions\n", nb_struct, nb_union);
    if (nb_pointer > 0 || nb_array > 0)
      fprintf (stderr, "@@%%@@ %d pointers, %d arrays\n", nb_pointer, nb_array);
@@ -376,7 +442,7 @@ index 98d4626f87e..91eacc26932 100644
    if (nb_lang_struct > 0)
      fprintf (stderr, "@@%%@@ %d lang_structs\n", nb_lang_struct);
    if (nb_user_struct > 0)
-@@ -490,6 +496,10 @@ struct type scalar_char = {
+@@ -495,6 +501,10 @@ struct type scalar_char = {
    TYPE_SCALAR, 0, 0, 0, GC_USED, {0}
  };
  
@@ -387,7 +453,7 @@ index 98d4626f87e..91eacc26932 100644
  /* Lists of various things.  */
  
  pair_p typedefs = NULL;
-@@ -1459,7 +1469,7 @@ static void set_gc_used (pair_p);
+@@ -1464,7 +1474,7 @@ static void set_gc_used (pair_p);
  
  static void
  process_gc_options (options_p opt, enum gc_used_enum level, int *maybe_undef,
@@ -396,7 +462,7 @@ index 98d4626f87e..91eacc26932 100644
  {
    options_p o;
    for (o = opt; o; o = o->next)
-@@ -1473,6 +1483,8 @@ process_gc_options (options_p opt, enum gc_used_enum level, int *maybe_undef,
+@@ -1478,6 +1488,8 @@ process_gc_options (options_p opt, enum gc_used_enum level, int *maybe_undef,
        *length = 1;
      else if (strcmp (o->name, "skip") == 0)
        *skip = 1;
@@ -405,7 +471,7 @@ index 98d4626f87e..91eacc26932 100644
      else if (strcmp (o->name, "nested_ptr") == 0
  	     && o->kind == OPTION_NESTED)
        *nested_ptr = ((const struct nested_ptr_data *) o->info.nested)->type;
-@@ -1521,7 +1533,7 @@ set_gc_used_type (type_p t, enum gc_used_enum level,
+@@ -1526,7 +1538,7 @@ set_gc_used_type (type_p t, enum gc_used_enum level,
  	type_p dummy2;
  	bool allow_undefined_field_types = (t->kind == TYPE_USER_STRUCT);
  
@@ -414,7 +480,7 @@ index 98d4626f87e..91eacc26932 100644
  			    &dummy2);
  
  	if (t->u.s.base_class)
-@@ -1537,9 +1549,10 @@ set_gc_used_type (type_p t, enum gc_used_enum level,
+@@ -1542,9 +1554,10 @@ set_gc_used_type (type_p t, enum gc_used_enum level,
  	    int maybe_undef = 0;
  	    int length = 0;
  	    int skip = 0;
@@ -426,7 +492,7 @@ index 98d4626f87e..91eacc26932 100644
  
  	    if (nested_ptr && f->type->kind == TYPE_POINTER)
  	      set_gc_used_type (nested_ptr, GC_POINTED_TO);
-@@ -1549,6 +1562,8 @@ set_gc_used_type (type_p t, enum gc_used_enum level,
+@@ -1554,6 +1567,8 @@ set_gc_used_type (type_p t, enum gc_used_enum level,
  	      set_gc_used_type (f->type->u.p, GC_MAYBE_POINTED_TO);
  	    else if (skip)
  	      ;			/* target type is not used through this field */
@@ -435,7 +501,7 @@ index 98d4626f87e..91eacc26932 100644
  	    else
  	      set_gc_used_type (f->type, GC_USED, allow_undefined_field_types);
  	  }
-@@ -2512,6 +2527,7 @@ output_mangled_typename (outf_p of, const_type_p t)
+@@ -2519,6 +2534,7 @@ output_mangled_typename (outf_p of, const_type_p t)
        {
        case TYPE_NONE:
        case TYPE_UNDEFINED:
@@ -443,7 +509,7 @@ index 98d4626f87e..91eacc26932 100644
  	gcc_unreachable ();
  	break;
        case TYPE_POINTER:
-@@ -2712,6 +2728,8 @@ walk_type (type_p t, struct walk_type_data *d)
+@@ -2719,6 +2735,8 @@ walk_type (type_p t, struct walk_type_data *d)
        ;
      else if (strcmp (oo->name, "for_user") == 0)
        ;
@@ -452,7 +518,7 @@ index 98d4626f87e..91eacc26932 100644
      else
        error_at_line (d->line, "unknown option `%s'\n", oo->name);
  
-@@ -2737,6 +2755,7 @@ walk_type (type_p t, struct walk_type_data *d)
+@@ -2744,6 +2762,7 @@ walk_type (type_p t, struct walk_type_data *d)
      {
      case TYPE_SCALAR:
      case TYPE_STRING:
@@ -460,7 +526,7 @@ index 98d4626f87e..91eacc26932 100644
        d->process_field (t, d);
        break;
  
-@@ -3268,6 +3287,7 @@ write_types_process_field (type_p f, const struct walk_type_data *d)
+@@ -3275,6 +3294,7 @@ write_types_process_field (type_p f, const struct walk_type_data *d)
        break;
  
      case TYPE_SCALAR:
@@ -468,7 +534,7 @@ index 98d4626f87e..91eacc26932 100644
        break;
  
      case TYPE_ARRAY:
-@@ -3813,6 +3833,7 @@ write_types_local_user_process_field (type_p f, const struct walk_type_data *d)
+@@ -3820,6 +3840,7 @@ write_types_local_user_process_field (type_p f, const struct walk_type_data *d)
        break;
  
      case TYPE_SCALAR:
@@ -476,7 +542,7 @@ index 98d4626f87e..91eacc26932 100644
        break;
  
      case TYPE_ARRAY:
-@@ -3899,6 +3920,13 @@ write_types_local_process_field (type_p f, const struct walk_type_data *d)
+@@ -3906,6 +3927,13 @@ write_types_local_process_field (type_p f, const struct walk_type_data *d)
      case TYPE_SCALAR:
        break;
  
@@ -490,7 +556,7 @@ index 98d4626f87e..91eacc26932 100644
      case TYPE_ARRAY:
      case TYPE_NONE:
      case TYPE_UNDEFINED:
-@@ -4427,6 +4455,7 @@ write_root (outf_p f, pair_p v, type_p type, const char *name, int has_length,
+@@ -4434,6 +4462,7 @@ write_root (outf_p f, pair_p v, type_p type, const char *name, int has_length,
      case TYPE_UNDEFINED:
      case TYPE_UNION:
      case TYPE_LANG_STRUCT:
@@ -498,7 +564,7 @@ index 98d4626f87e..91eacc26932 100644
        error_at_line (line, "global `%s' is unimplemented type", name);
      }
  }
-@@ -4721,6 +4750,9 @@ dump_typekind (int indent, enum typekind kind)
+@@ -4728,6 +4757,9 @@ dump_typekind (int indent, enum typekind kind)
      case TYPE_ARRAY:
        printf ("TYPE_ARRAY");
        break;
@@ -508,7 +574,7 @@ index 98d4626f87e..91eacc26932 100644
      case TYPE_LANG_STRUCT:
        printf ("TYPE_LANG_STRUCT");
        break;
-@@ -4887,6 +4919,7 @@ dump_type (int indent, type_p t)
+@@ -4894,6 +4926,7 @@ dump_type (int indent, type_p t)
  	      t->u.scalar_is_char ? "true" : "false");
        break;
      case TYPE_STRING:
@@ -517,10 +583,10 @@ index 98d4626f87e..91eacc26932 100644
      case TYPE_STRUCT:
      case TYPE_UNION:
 diff --git a/gcc/gengtype.h b/gcc/gengtype.h
-index 4fe8f0f7232..c32faba2995 100644
+index 8a7a54957ea..8fa7064ca85 100644
 --- a/gcc/gengtype.h
 +++ b/gcc/gengtype.h
-@@ -149,6 +149,9 @@ enum typekind {
+@@ -154,6 +154,9 @@ enum typekind {
    TYPE_UNION,           /* Type for GTY-ed discriminated unions.  */
    TYPE_POINTER,         /* Pointer type to GTY-ed type.  */
    TYPE_ARRAY,           /* Array of GTY-ed types.  */
@@ -530,7 +596,7 @@ index 4fe8f0f7232..c32faba2995 100644
    TYPE_LANG_STRUCT,     /* GCC front-end language specific structs.
                             Various languages may have homonymous but
                             different structs.  */
-@@ -326,6 +329,9 @@ extern struct type string_type;
+@@ -331,6 +334,9 @@ extern struct type string_type;
  extern struct type scalar_nonchar;
  extern struct type scalar_char;
  
@@ -541,10 +607,10 @@ index 4fe8f0f7232..c32faba2995 100644
     specific one.  */
  #define UNION_P(x)					\
 diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
-index 357bda13f97..88e1af4ba4a 100644
+index b6abed1d9a2..7c998e95473 100644
 --- a/gcc/ggc-common.c
 +++ b/gcc/ggc-common.c
-@@ -249,6 +249,7 @@ saving_hasher::equal (const ptr_data *p1, const void *p2)
+@@ -256,6 +256,7 @@ saving_hasher::equal (const ptr_data *p1
  }
  
  static hash_table<saving_hasher> *saving_htab;
@@ -552,7 +618,7 @@ index 357bda13f97..88e1af4ba4a 100644
  
  /* Register an object in the hash table.  */
  
-@@ -281,6 +282,23 @@ gt_pch_note_object (void *obj, void *note_ptr_cookie,
+@@ -288,6 +289,23 @@ gt_pch_note_object (void *obj, void *not
    return 1;
  }
  
@@ -576,18 +642,7 @@ index 357bda13f97..88e1af4ba4a 100644
  /* Register an object in the hash table.  */
  
  void
-@@ -443,6 +461,10 @@ gt_pch_save (FILE *f)
+@@ -582,10 +600,20 @@ gt_pch_save (FILE *f)
-      (The extra work goes in HOST_HOOKS_GT_PCH_GET_ADDRESS and
-      HOST_HOOKS_GT_PCH_USE_ADDRESS.)  */
-   mmi.preferred_base = host_hooks.gt_pch_get_address (mmi.size, fileno (f));
-+  /* If the host cannot supply any suitable address for this, we are stuck.  */
-+  if (mmi.preferred_base == NULL)
-+    fatal_error (input_location,
-+		 "cannot write PCH file: required memory segment unavailable");
- 
-   ggc_pch_this_base (state.d, mmi.preferred_base);
- 
-@@ -575,10 +597,20 @@ gt_pch_save (FILE *f)
    ggc_pch_finish (state.d, state.f);
    gt_pch_fixup_stringpool ();
  
@@ -608,64 +663,7 @@ index 357bda13f97..88e1af4ba4a 100644
  }
  
  /* Read the state of the compiler back in from F.  */
-@@ -592,6 +624,13 @@ gt_pch_restore (FILE *f)
+@@ -639,6 +667,30 @@ gt_pch_restore (FILE *f)
-   struct mmap_info mmi;
-   int result;
- 
-+  /* We are about to reload the line maps along with the rest of the PCH
-+     data, which means that the (loaded) ones cannot be guaranteed to be
-+     in any valid state for reporting diagnostics that happen during the
-+     load.  Save the current table (and use it during the loading process
-+     below).  */
-+  class line_maps *save_line_table = line_table;
-+
-   /* Delete any deletable objects.  This makes ggc_pch_read much
-      faster, as it can be sure that no GCable objects remain other
-      than the ones just read in.  */
-@@ -606,20 +645,40 @@ gt_pch_restore (FILE *f)
- 	fatal_error (input_location, "cannot read PCH file: %m");
- 
-   /* Read in all the global pointers, in 6 easy loops.  */
-+  bool error_reading_pointers = false;
-   for (rt = gt_ggc_rtab; *rt; rt++)
-     for (rti = *rt; rti->base != NULL; rti++)
-       for (i = 0; i < rti->nelt; i++)
- 	if (fread ((char *)rti->base + rti->stride * i,
- 		   sizeof (void *), 1, f) != 1)
--	  fatal_error (input_location, "cannot read PCH file: %m");
-+	  error_reading_pointers = true;
-+
-+  /* Stash the newly read-in line table pointer - it does not point to
-+     anything meaningful yet, so swap the old one back in.  */
-+  class line_maps *new_line_table = line_table;
-+  line_table = save_line_table;
-+  if (error_reading_pointers)
-+    fatal_error (input_location, "cannot read PCH file: %m");
- 
-   if (fread (&mmi, sizeof (mmi), 1, f) != 1)
-     fatal_error (input_location, "cannot read PCH file: %m");
- 
-   result = host_hooks.gt_pch_use_address (mmi.preferred_base, mmi.size,
- 					  fileno (f), mmi.offset);
-+
-+  /* We could not mmap or otherwise allocate the required memory at the
-+     address needed.  */
-   if (result < 0)
--    fatal_error (input_location, "had to relocate PCH");
-+    {
-+      sorry_at (input_location, "PCH relocation is not yet supported");
-+      /* There is no point in continuing from here, we will only end up
-+	 with a crashed (most likely hanging) compiler.  */
-+      exit (-1);
-+    }
-+
-+  /* (0) We allocated memory, but did not mmap the file, so we need to read
-+     the data in manually.  (>0) Otherwise the mmap succeed for the address
-+     we wanted.  */
-   if (result == 0)
-     {
-       if (fseek (f, mmi.offset, SEEK_SET) != 0
-@@ -632,6 +691,34 @@ gt_pch_restore (FILE *f)
    ggc_pch_read (f, mmi.preferred_base);
  
    gt_pch_restore_stringpool ();
@@ -693,15 +691,11 @@ index 357bda13f97..88e1af4ba4a 100644
 +    }
 +  else if (fseek (f, num_callbacks * sizeof (void *), SEEK_CUR) != 0)
 +    fatal_error (input_location, "cannot read PCH file: %m");
-+
-+  /* Barring corruption of the PCH file, the restored line table should be
-+     complete and usable.  */
-+  line_table = new_line_table;
  }
  
  /* Default version of HOST_HOOKS_GT_PCH_GET_ADDRESS when mmap is not present.
 diff --git a/gcc/ggc.h b/gcc/ggc.h
-index 65f6cb4d19d..3339394b547 100644
+index 5e921d957fd..c005f7e0412 100644
 --- a/gcc/ggc.h
 +++ b/gcc/ggc.h
 @@ -46,6 +46,10 @@ typedef void (*gt_handle_reorder) (void *, void *, gt_pointer_operator,
@@ -716,10 +710,10 @@ index 65f6cb4d19d..3339394b547 100644
     function.  */
  extern void gt_pch_note_reorder (void *, void *, gt_handle_reorder);
 diff --git a/gcc/output.h b/gcc/output.h
-index 2bfeed93c56..7412407c2c0 100644
+index 8f6f15308f4..4a23795bf7e 100644
 --- a/gcc/output.h
 +++ b/gcc/output.h
-@@ -458,7 +458,7 @@ struct GTY(()) named_section {
+@@ -456,7 +456,7 @@ struct GTY(()) named_section {
  
  /* A callback that writes the assembly code for switching to an unnamed
     section.  The argument provides callback-specific data.  */
@@ -728,7 +722,7 @@ index 2bfeed93c56..7412407c2c0 100644
  
  /* Information about a SECTION_UNNAMED section.  */
  struct GTY(()) unnamed_section {
-@@ -466,8 +466,8 @@ struct GTY(()) unnamed_section {
+@@ -464,8 +464,8 @@ struct GTY(()) unnamed_section {
  
    /* The callback used to switch to the section, and the data that
       should be passed to the callback.  */
@@ -739,7 +733,7 @@ index 2bfeed93c56..7412407c2c0 100644
  
    /* The next entry in the chain of unnamed sections.  */
    section *next;
-@@ -491,7 +491,7 @@ struct GTY(()) noswitch_section {
+@@ -489,7 +489,7 @@ struct GTY(()) noswitch_section {
    struct section_common common;
  
    /* The callback used to assemble decls in this section.  */
@@ -748,7 +742,7 @@ index 2bfeed93c56..7412407c2c0 100644
  };
  
  /* Information about a section, which may be named or unnamed.  */
-@@ -526,8 +526,8 @@ extern GTY(()) section *bss_noswitch_section;
+@@ -524,8 +524,8 @@ extern GTY(()) section *bss_noswitch_sec
  extern GTY(()) section *in_section;
  extern GTY(()) bool in_cold_section_p;
  
@@ -756,23 +750,23 @@ index 2bfeed93c56..7412407c2c0 100644
 -				     const void *);
 +extern section *get_unnamed_section (unsigned int, void (*) (const char *),
 +				     const char *);
- extern section *get_section (const char *, unsigned int, tree,
+ extern section *get_section (const char *, unsigned int, tree);
- 			     bool not_existing = false);
  extern section *get_named_section (tree, const char *, int);
-@@ -549,7 +549,7 @@ extern section *get_cdtor_priority_section (int, bool);
+ extern section *get_variable_section (tree, bool);
+@@ -546,7 +546,7 @@ extern section *get_cdtor_priority_secti
  
  extern bool unlikely_text_section_p (section *);
- extern void switch_to_section (section *, tree = nullptr);
+ extern void switch_to_section (section *);
 -extern void output_section_asm_op (const void *);
 +extern void output_section_asm_op (const char *);
  
  extern void record_tm_clone_pair (tree, tree);
  extern void finish_tm_clone_pairs (void);
 diff --git a/gcc/tree-core.h b/gcc/tree-core.h
-index c31b8ebf249..e2fd2e67440 100644
+index 8ab119dc9a2..91ae5237d7e 100644
 --- a/gcc/tree-core.h
 +++ b/gcc/tree-core.h
-@@ -1927,7 +1927,7 @@ struct GTY(()) tree_function_decl {
+@@ -1961,7 +1961,7 @@ struct GTY(()) tree_function_decl {
  struct GTY(()) tree_translation_unit_decl {
    struct tree_decl_common common;
    /* Source language of this translation unit.  Used for DWARF output.  */
@@ -782,7 +776,7 @@ index c31b8ebf249..e2fd2e67440 100644
    /* TODO: Root of a partial DWARF tree for global types and decls.  */
  };
 diff --git a/gcc/varasm.c b/gcc/varasm.c
-index a7ef9b8d9fe..baf9f1ba0e4 100644
+index 9315e2c6936..aff93ca5de9 100644
 --- a/gcc/varasm.c
 +++ b/gcc/varasm.c
 @@ -250,8 +250,8 @@ object_block_hasher::hash (object_block *old)
@@ -796,7 +790,7 @@ index a7ef9b8d9fe..baf9f1ba0e4 100644
  {
    section *sect;
  
-@@ -7753,9 +7753,9 @@ file_end_indicate_split_stack (void)
+@@ -7778,9 +7778,9 @@ file_end_indicate_split_stack (void)
     a get_unnamed_section callback.  */
  
  void
@@ -809,13 +803,13 @@ index a7ef9b8d9fe..baf9f1ba0e4 100644
  
  /* Emit assembly code to switch to section NEW_SECTION.  Do nothing if
 diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
-index 7d964172469..1073542681d 100644
+index 8b5e2f82982..bc40e333579 100644
 --- a/libcpp/include/line-map.h
 +++ b/libcpp/include/line-map.h
-@@ -803,11 +803,11 @@ public:
+@@ -758,11 +758,11 @@ struct GTY(()) line_maps {
-   unsigned int max_column_hint;
  
-   /* The allocator to use when resizing 'maps', defaults to xrealloc.  */
+   /* If non-null, the allocator to use when resizing 'maps'.  If null,
+      xrealloc is used.  */
 -  line_map_realloc reallocator;
 +  line_map_realloc GTY((callback)) reallocator;
  
@@ -826,3 +820,25 @@ index 7d964172469..1073542681d 100644
  
    struct location_adhoc_data_map location_adhoc_data_map;
  
+diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
+index 6ba038881d6..1c2f7d564e7 100644
+--- a/gcc/config/avr/avr.c
++++ b/gcc/config/avr/avr.c
+@@ -10089,7 +10089,7 @@ avr_asm_asm_output_aligned_bss (FILE *file, tree decl, const char *name,
+    to track need of __do_copy_data.  */
+ 
+ static void
+-avr_output_data_section_asm_op (const void *data)
++avr_output_data_section_asm_op (const char *data)
+ {
+   avr_need_copy_data_p = true;
+ 
+@@ -10102,7 +10102,7 @@ avr_output_data_section_asm_op (const void *data)
+    to track need of __do_clear_bss.  */
+ 
+ static void
+-avr_output_bss_section_asm_op (const void *data)
++avr_output_bss_section_asm_op (const char *data)
+ {
+   avr_need_clear_bss_p = true;
+ 

SOURCES/gcc8-pr100797.patch

@@ -0,0 +1,137 @@
+commit ebfe8b28d40746ff33724bd5b9ade2552e619213
+Author: Jason Merrill <jason@redhat.com>
+Date:   Thu May 27 23:54:52 2021 -0400
+
+    c++: 'this' adjustment for devirtualized call
+    
+    My patch for 95719 made us do a better job of finding the actual virtual
+    function we want to call, but didn't update the 'this' pointer adjustment to
+    match.
+    
+    This backport also incorporates a bit of the r11-1638 reorganization.
+    
+            PR c++/100797
+            PR c++/95719
+    
+    gcc/cp/ChangeLog:
+    
+            * call.c (build_over_call): Adjust base_binfo in
+            resolves_to_fixed_type_p case.
+    
+    gcc/testsuite/ChangeLog:
+    
+            * g++.dg/inherit/virtual15.C: New test.
+            * g++.dg/inherit/virtual15a.C: New test.
+
+--- gcc/cp/call.c
++++ gcc/cp/call.c
+@@ -8309,19 +8309,6 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
+ 	  || CLASSTYPE_FINAL (TYPE_METHOD_BASETYPE (TREE_TYPE (fn))))
+ 	flags |= LOOKUP_NONVIRTUAL;
+ 
+-      /* If we know the dynamic type of the object, look up the final overrider
+-	 in the BINFO.  */
+-      if (DECL_VINDEX (fn) && (flags & LOOKUP_NONVIRTUAL) == 0
+-	  && resolves_to_fixed_type_p (arg))
+-	{
+-	  tree binfo = cand->conversion_path;
+-	  if (BINFO_TYPE (binfo) != DECL_CONTEXT (fn))
+-	    binfo = lookup_base (binfo, DECL_CONTEXT (fn), ba_unique,
+-				 NULL, complain);
+-	  fn = lookup_vfn_in_binfo (DECL_VINDEX (fn), binfo);
+-	  flags |= LOOKUP_NONVIRTUAL;
+-	}
+-
+       /* [class.mfct.nonstatic]: If a nonstatic member function of a class
+ 	 X is called for an object that is not of type X, or of a type
+ 	 derived from X, the behavior is undefined.
+@@ -8331,10 +8318,6 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
+       gcc_assert (TYPE_PTR_P (parmtype));
+       /* Convert to the base in which the function was declared.  */
+       gcc_assert (cand->conversion_path != NULL_TREE);
+-      converted_arg = build_base_path (PLUS_EXPR,
+-				       arg,
+-				       cand->conversion_path,
+-				       1, complain);
+       /* Check that the base class is accessible.  */
+       if (!accessible_base_p (TREE_TYPE (argtype),
+ 			      BINFO_TYPE (cand->conversion_path), true))
+@@ -8349,10 +8332,33 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
+       /* If fn was found by a using declaration, the conversion path
+ 	 will be to the derived class, not the base declaring fn. We
+ 	 must convert from derived to base.  */
+-      base_binfo = lookup_base (TREE_TYPE (TREE_TYPE (converted_arg)),
++      base_binfo = lookup_base (cand->conversion_path,
+ 				TREE_TYPE (parmtype), ba_unique,
+ 				NULL, complain);
+-      converted_arg = build_base_path (PLUS_EXPR, converted_arg,
++
++      /* If we know the dynamic type of the object, look up the final overrider
++	 in the BINFO.  */
++      if (DECL_VINDEX (fn) && (flags & LOOKUP_NONVIRTUAL) == 0
++	  && resolves_to_fixed_type_p (arg))
++	{
++	  tree ov = lookup_vfn_in_binfo (DECL_VINDEX (fn), base_binfo);
++
++	  /* And unwind base_binfo to match.  If we don't find the type we're
++	     looking for in BINFO_INHERITANCE_CHAIN, we're looking at diamond
++	     inheritance; for now do a normal virtual call in that case.  */
++	  tree octx = DECL_CONTEXT (ov);
++	  tree obinfo = base_binfo;
++	  while (obinfo && !SAME_BINFO_TYPE_P (BINFO_TYPE (obinfo), octx))
++	    obinfo = BINFO_INHERITANCE_CHAIN (obinfo);
++	  if (obinfo)
++	    {
++	      fn = ov;
++	      base_binfo = obinfo;
++	      flags |= LOOKUP_NONVIRTUAL;
++	    }
++	}
++
++      converted_arg = build_base_path (PLUS_EXPR, arg,
+ 				       base_binfo, 1, complain);
+ 
+       argarray[j++] = converted_arg;
+--- /dev/null
++++ gcc/testsuite/g++.dg/inherit/virtual15.C
+@@ -0,0 +1,18 @@
++// PR c++/100797
++// { dg-do run }
++
++bool ok = false;
++struct S1 { virtual ~S1() {} };
++struct S2 { virtual void f1() = 0; };
++struct S3: S1, S2 {
++    void f1() { f2(); }
++    virtual void f2() = 0;
++};
++struct S4: S3 {
++  void f2() { ok = true; }
++  using S2::f1;
++};
++int main() {
++  S4().f1();
++  if (!ok) __builtin_abort ();
++}
+--- /dev/null
++++ gcc/testsuite/g++.dg/inherit/virtual15a.C
+@@ -0,0 +1,19 @@
++// PR c++/100797 plus diamond inheritance
++// { dg-do run }
++
++bool ok = false;
++struct S1 { virtual ~S1() {} };
++struct S2 { virtual void f1() = 0; };
++struct S3: S1, virtual S2 {
++    void f1() { f2(); }
++    virtual void f2() = 0;
++};
++struct SX: virtual S2 { };
++struct S4: SX, S3 {
++  void f2() { ok = true; }
++  using S2::f1;
++};
++int main() {
++  S4().f1();
++  if (!ok) __builtin_abort ();
++}

SOURCES/gcc8-pr105502.patch

@@ -0,0 +1,98 @@
+From b005000525ab0a5116d21217c41fb1da5bd03796 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Fri, 6 May 2022 21:19:17 +0100
+Subject: [PATCH] libstdc++: Fix deserialization for std::normal_distribution
+ [PR105502]
+
+This fixes a regression in std::normal_distribution deserialization that
+caused the object to be left unchanged if the __state_avail value read
+from the stream was false.
+
+libstdc++-v3/ChangeLog:
+
+	PR libstdc++/105502
+	* include/bits/random.tcc
+	(operator>>(basic_istream<C,T>&, normal_distribution<R>&)):
+	Update state when __state_avail is false.
+	* testsuite/26_numerics/random/normal_distribution/operators/serialize.cc:
+	Check that deserialized object equals serialized one.
+
+(cherry picked from commit 909ef4e2727ddc50a32d6ad379a1f1ccc1043c6a)
+---
+ libstdc++-v3/include/bits/random.tcc          |  2 +-
+ .../operators/serialize.cc                    | 36 ++++++++++++++++++-
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
+index 0a299baedc5..0f758671f69 100644
+--- a/libstdc++-v3/include/bits/random.tcc
++++ b/libstdc++-v3/include/bits/random.tcc
+@@ -1941,7 +1941,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+       bool __saved_avail;
+       if (__is >> __mean >> __stddev >> __saved_avail)
+ 	{
+-	  if (__saved_avail && (__is >> __x._M_saved))
++	  if (!__saved_avail || (__is >> __x._M_saved))
+ 	    {
+ 	      __x._M_saved_available = __saved_avail;
+ 	      __x.param(typename normal_distribution<_RealType>::
+diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/serialize.cc b/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/serialize.cc
+index a65d4004161..8cc70886bc7 100644
+--- a/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/serialize.cc
++++ b/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/serialize.cc
+@@ -25,6 +25,7 @@
+ 
+ #include <random>
+ #include <sstream>
++#include <testsuite_hooks.h>
+ 
+ void
+ test01()
+@@ -37,10 +38,43 @@ test01()
+   str << u;
+ 
+   str >> v;
++  VERIFY( u == v );
++}
++
++void
++test_pr105502()
++{
++  // PR libstdc++/105502 std::normal_distribution deserialization issue
++  std::stringstream str;
++  std::normal_distribution<> d{1, 2}, d2;
++  std::minstd_rand0 g;
++  str << d;
++  VERIFY( str );
++  str >> d2;
++  VERIFY( str );
++  VERIFY( d == d2 );
++
++  (void) d(g); // sets d._M_saved_available = true
++  str.str("");
++  str.clear();
++  str << d;
++  VERIFY( str );
++  str >> d2;
++  VERIFY( str );
++  VERIFY( d == d2 );
++
++  (void) d(g); // sets d._M_saved_available = false
++  str.str("");
++  str.clear();
++  str << d;
++  VERIFY( str );
++  str >> d2;
++  VERIFY( str );
++  VERIFY( d == d2 );
+ }
+ 
+ int main()
+ {
+   test01();
+-  return 0;
++  test_pr105502();
+ }
+-- 
+2.31.1
+

SOURCES/gcc8-pr111039.patch

@@ -0,0 +1,61 @@
+commit e150cbf591759af10f3d57acbe0eb381aafa00de
+Author: Richard Biener <rguenther@suse.de>
+Date:   Thu Aug 17 13:10:14 2023 +0200
+
+    tree-optimization/111039 - abnormals and bit test merging
+    
+    The following guards the bit test merging code in if-combine against
+    the appearance of SSA names used in abnormal PHIs.
+    
+            PR tree-optimization/111039
+            * tree-ssa-ifcombine.cc (ifcombine_ifandif): Check for
+            SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
+    
+            * gcc.dg/pr111039.c: New testcase.
+    
+    (cherry picked from commit 482551a79a3d3f107f6239679ee74655cfe8707e)
+
+diff --git a/gcc/testsuite/gcc.dg/pr111039.c b/gcc/testsuite/gcc.dg/pr111039.c
+new file mode 100644
+index 00000000000..bec9983b35f
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr111039.c
+@@ -0,0 +1,15 @@
++/* { dg-do compile } */
++/* { dg-options "-O" } */
++
++int _setjmp ();
++void abcd ();
++void abcde ();
++void compiler_corruption_function(int flags)
++{
++  int nowait = flags & 1048576, isexpand = flags & 8388608;
++  abcd();
++  _setjmp(flags);
++  if (nowait && isexpand)
++    flags &= 0;
++  abcde();
++}
+--- a/gcc/tree-ssa-ifcombine.c
++++ b/gcc/tree-ssa-ifcombine.c
+@@ -407,6 +407,9 @@ ifcombine_ifandif (basic_block inner_con
+     {
+       tree t, t2;
+ 
++      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
++	return false;
++
+       /* Do it.  */
+       gsi = gsi_for_stmt (inner_cond);
+       t = fold_build2 (LSHIFT_EXPR, TREE_TYPE (name1),
+@@ -457,6 +460,10 @@ ifcombine_ifandif (basic_block inner_con
+       gimple_stmt_iterator gsi;
+       tree t;
+ 
++      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)
++	  || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))
++	return false;
++
+       /* Find the common name which is bit-tested.  */
+       if (name1 == name2)
+ 	;

SOURCES/gcc8-pr111070.patch

@@ -0,0 +1,68 @@
+commit ad42dcf501e41713047cf6c47cbb1dd9f01088a4
+Author: Richard Biener <rguenther@suse.de>
+Date:   Mon Aug 21 09:01:00 2023 +0200
+
+    tree-optimization/111070 - fix ICE with recent ifcombine fix
+    
+    We now got test coverage for non-SSA name bits so the following amends
+    the SSA_NAME_OCCURS_IN_ABNORMAL_PHI checks.
+    
+            PR tree-optimization/111070
+            * tree-ssa-ifcombine.cc (ifcombine_ifandif): Check we have
+            an SSA name before checking SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
+    
+            * gcc.dg/pr111070.c: New testcase.
+    
+    (cherry picked from commit 966b0a96523fb7adbf498ac71df5e033c70dc546)
+
+diff --git a/gcc/testsuite/gcc.dg/pr111070.c b/gcc/testsuite/gcc.dg/pr111070.c
+new file mode 100644
+index 00000000000..1ebc7adf782
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr111070.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O" } */
++
++/* common */
++char c;
++/* arrays must be 8 byte aligned, regardless of size */
++char c_ary[1];
++
++/* data */
++char d = 1;
++char d_ary[1] = {1};
++
++int main ()
++{
++  if (((unsigned long)&c_ary[0] & 7) != 0)
++    return 1;
++  if (((unsigned long)&d_ary[0] & 7) != 0)
++    return 1;
++  return 0;
++}
+--- a/gcc/tree-ssa-ifcombine.c
++++ b/gcc/tree-ssa-ifcombine.c
+@@ -436,7 +436,8 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
+     {
+       tree t, t2;
+ 
+-      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
++      if (TREE_CODE (name1) == SSA_NAME
++	  && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
+ 	return false;
+ 
+       /* Do it.  */
+@@ -495,8 +496,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
+       gimple_stmt_iterator gsi;
+       tree t;
+ 
+-      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)
+-	  || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))
++      if ((TREE_CODE (name1) == SSA_NAME
++	   && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
++	  || (TREE_CODE (name2) == SSA_NAME
++	      && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2)))
+ 	return false;
+ 
+       /* Find the common name which is bit-tested.  */

SOURCES/gcc8-pr87723.patch

@@ -0,0 +1,71 @@
+commit 8c21b0d164f33d9d47acc26f4f9b99b53e3b1945
+Author: Andreas Krebbel <krebbel@linux.ibm.com>
+Date:   Tue Nov 6 10:22:05 2018 +0000
+
+    S/390: Fix PR87723
+    
+    gcc/ChangeLog:
+    
+    2018-11-06  Andreas Krebbel  <krebbel@linux.ibm.com>
+    
+            PR target/87723
+            * config/s390/s390.md ("*r<noxa>sbg_di_rotl"): Remove mode
+            attributes for operands 3 and 4.
+    
+    gcc/testsuite/ChangeLog:
+    
+    2018-11-06  Andreas Krebbel  <krebbel@linux.ibm.com>
+    
+            PR target/87723
+            * gcc.target/s390/pr87723.c: New test.
+    
+    From-SVN: r265832
+
+diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
+index 8e7b285e1c3..4ffd438c07c 100644
+--- a/gcc/config/s390/s390.md
++++ b/gcc/config/s390/s390.md
+@@ -4230,7 +4230,7 @@ (define_insn "*r<noxa>sbg_di_rotl"
+ 	  (match_operand:DI 4 "nonimmediate_operand" "0")))
+    (clobber (reg:CC CC_REGNUM))]
+   "TARGET_Z10"
+-  "r<noxa>sbg\t%0,%1,%<bfstart>2,%<bfend>2,%b3"
++  "r<noxa>sbg\t%0,%1,%s2,%e2,%b3"
+   [(set_attr "op_type" "RIE")])
+ 
+ ; rosbg, rxsbg
+diff --git a/gcc/testsuite/gcc.target/s390/pr87723.c b/gcc/testsuite/gcc.target/s390/pr87723.c
+new file mode 100644
+index 00000000000..b0e8a5a3118
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/s390/pr87723.c
+@@ -0,0 +1,29 @@
++/* { dg-do compile } */
++/* { dg-options "-O3 -march=z196 -m64 -mzarch" } */
++
++unsigned long a;
++int b;
++void c(char* i) {
++  for (;;) {
++    char g = 0;
++    for (; g < 24; ++g)
++      b = a << g | a >> 64 - g;
++    {
++      char *d = i;
++      long h = b;
++      char e = 0;
++      for (; e < 8; ++e)
++	d[e] = h;
++    }
++    char *d = i;
++    signed e;
++    unsigned long f = 0;
++    e = 7;
++    for (; e; --e) {
++      f <<= 8;
++      f |= d[e];
++    }
++    for (; e < 8; ++e)
++      d[e] = f;
++  }
++}

SOURCES/gcc8-pr96796.patch

@@ -0,0 +1,254 @@
+commit 6001db79c477b03eacc7e7049560921fb54b7845
+Author: Richard Sandiford <richard.sandiford@arm.com>
+Date:   Mon Sep 7 20:15:36 2020 +0100
+
+    lra: Avoid cycling on certain subreg reloads [PR96796]
+    
+    This PR is about LRA cycling for a reload of the form:
+    
+    ----------------------------------------------------------------------------
+    Changing pseudo 196 in operand 1 of insn 103 on equiv [r105:DI*0x8+r140:DI]
+          Creating newreg=287, assigning class ALL_REGS to slow/invalid mem r287
+          Creating newreg=288, assigning class ALL_REGS to slow/invalid mem r288
+      103: r203:SI=r288:SI<<0x1+r196:DI#0
+          REG_DEAD r196:DI
+        Inserting slow/invalid mem reload before:
+      316: r287:DI=[r105:DI*0x8+r140:DI]
+      317: r288:SI=r287:DI#0
+    ----------------------------------------------------------------------------
+    
+    The problem is with r287.  We rightly give it a broad starting class of
+    POINTER_AND_FP_REGS (reduced from ALL_REGS by preferred_reload_class).
+    However, we never make forward progress towards narrowing it down to
+    a specific choice of class (POINTER_REGS or FP_REGS).
+    
+    I think in practice we rely on two things to narrow a reload pseudo's
+    class down to a specific choice:
+    
+    (1) a restricted class is specified when the pseudo is created
+    
+        This happens for input address reloads, where the class is taken
+        from the target's chosen base register class.  It also happens
+        for simple REG reloads, where the class is taken from the chosen
+        alternative's constraints.
+    
+    (2) uses of the reload pseudo as a direct input operand
+    
+        In this case get_reload_reg tries to reuse the existing register
+        and narrow its class, instead of creating a new reload pseudo.
+    
+    However, neither occurs here.  As described above, r287 rightly
+    starts out with a wide choice of class, ultimately derived from
+    ALL_REGS, so we don't get (1).  And as the comments in the PR
+    explain, r287 is never used as an input reload, only the subreg is,
+    so we don't get (2):
+    
+    ----------------------------------------------------------------------------
+             Choosing alt 13 in insn 317:  (0) r  (1) w {*movsi_aarch64}
+          Creating newreg=291, assigning class FP_REGS to r291
+      317: r288:SI=r291:SI
+        Inserting insn reload before:
+      320: r291:SI=r287:DI#0
+    ----------------------------------------------------------------------------
+    
+    IMO, in this case we should rely on the reload of r316 to narrow
+    down the class of r278.  Currently we do:
+    
+    ----------------------------------------------------------------------------
+             Choosing alt 7 in insn 316:  (0) r  (1) m {*movdi_aarch64}
+          Creating newreg=289 from oldreg=287, assigning class GENERAL_REGS to r289
+      316: r289:DI=[r105:DI*0x8+r140:DI]
+        Inserting insn reload after:
+      318: r287:DI=r289:DI
+    ---------------------------------------------------
+    
+    i.e. we create a new pseudo register r289 and give *that* pseudo
+    GENERAL_REGS instead.  This is because get_reload_reg only narrows
+    down the existing class for OP_IN and OP_INOUT, not OP_OUT.
+    
+    But if we have a reload pseudo in a reload instruction and have chosen
+    a specific class for the reload pseudo, I think we should simply install
+    it for OP_OUT reloads too, if the class is a subset of the existing class.
+    We will need to pick such a register whatever happens (for r289 in the
+    example above).  And as explained in the PR, doing this actually avoids
+    an unnecessary move via the FP registers too.
+    
+    The patch is quite aggressive in that it does this for all reload
+    pseudos in all reload instructions.  I wondered about reusing the
+    condition for a reload move in in_class_p:
+    
+              INSN_UID (curr_insn) >= new_insn_uid_start
+              && curr_insn_set != NULL
+              && ((OBJECT_P (SET_SRC (curr_insn_set))
+                   && ! CONSTANT_P (SET_SRC (curr_insn_set)))
+                  || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG
+                      && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set)))
+                      && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set)))))))
+    
+    but I can't really justify that on first principles.  I think we
+    should apply the rule consistently until we have a specific reason
+    for doing otherwise.
+    
+    gcc/
+            PR rtl-optimization/96796
+            * lra-constraints.c (in_class_p): Add a default-false
+            allow_all_reload_class_changes_p parameter.  Do not treat
+            reload moves specially when the parameter is true.
+            (get_reload_reg): Try to narrow the class of an existing OP_OUT
+            reload if we're reloading a reload pseudo in a reload instruction.
+    
+    gcc/testsuite/
+            PR rtl-optimization/96796
+            * gcc.c-torture/compile/pr96796.c: New test.
+
+diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
+index 580da9c3ed6..161b721efb1 100644
+--- a/gcc/lra-constraints.c
++++ b/gcc/lra-constraints.c
+@@ -236,12 +236,17 @@ get_reg_class (int regno)
+    CL.  Use elimination first if REG is a hard register.  If REG is a
+    reload pseudo created by this constraints pass, assume that it will
+    be allocated a hard register from its allocno class, but allow that
+-   class to be narrowed to CL if it is currently a superset of CL.
++   class to be narrowed to CL if it is currently a superset of CL and
++   if either:
++
++   - ALLOW_ALL_RELOAD_CLASS_CHANGES_P is true or
++   - the instruction we're processing is not a reload move.
+ 
+    If NEW_CLASS is nonnull, set *NEW_CLASS to the new allocno class of
+    REGNO (reg), or NO_REGS if no change in its class was needed.  */
+ static bool
+-in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class)
++in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class,
++	    bool allow_all_reload_class_changes_p = false)
+ {
+   enum reg_class rclass, common_class;
+   machine_mode reg_mode;
+@@ -266,7 +271,8 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class)
+ 	 typically moves that have many alternatives, and restricting
+ 	 reload pseudos for one alternative may lead to situations
+ 	 where other reload pseudos are no longer allocatable.  */
+-      || (INSN_UID (curr_insn) >= new_insn_uid_start
++      || (!allow_all_reload_class_changes_p
++	  && INSN_UID (curr_insn) >= new_insn_uid_start
+ 	  && curr_insn_set != NULL
+ 	  && ((OBJECT_P (SET_SRC (curr_insn_set))
+ 	       && ! CONSTANT_P (SET_SRC (curr_insn_set)))
+@@ -551,13 +557,12 @@ init_curr_insn_input_reloads (void)
+   curr_insn_input_reloads_num = 0;
+ }
+ 
+-/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse already
+-   created input reload pseudo (only if TYPE is not OP_OUT).  Don't
+-   reuse pseudo if IN_SUBREG_P is true and the reused pseudo should be
+-   wrapped up in SUBREG.  The result pseudo is returned through
+-   RESULT_REG.  Return TRUE if we created a new pseudo, FALSE if we
+-   reused the already created input reload pseudo.  Use TITLE to
+-   describe new registers for debug purposes.  */
++/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse an existing
++   reload pseudo.  Don't reuse an existing reload pseudo if IN_SUBREG_P
++   is true and the reused pseudo should be wrapped up in a SUBREG.
++   The result pseudo is returned through RESULT_REG.  Return TRUE if we
++   created a new pseudo, FALSE if we reused an existing reload pseudo.
++   Use TITLE to describe new registers for debug purposes.  */
+ static bool
+ get_reload_reg (enum op_type type, machine_mode mode, rtx original,
+ 		enum reg_class rclass, bool in_subreg_p,
+@@ -616,6 +621,35 @@ get_reload_reg (enum op_type type, machine_mode mode, rtx original,
+ 
+   if (type == OP_OUT)
+     {
++      /* Output reload registers tend to start out with a conservative
++	 choice of register class.  Usually this is ALL_REGS, although
++	 a target might narrow it (for performance reasons) through
++	 targetm.preferred_reload_class.  It's therefore quite common
++	 for a reload instruction to require a more restrictive class
++	 than the class that was originally assigned to the reload register.
++
++	 In these situations, it's more efficient to refine the choice
++	 of register class rather than create a second reload register.
++	 This also helps to avoid cycling for registers that are only
++	 used by reload instructions.  */
++      if (REG_P (original)
++	  && (int) REGNO (original) >= new_regno_start
++	  && INSN_UID (curr_insn) >= new_insn_uid_start
++	  && in_class_p (original, rclass, &new_class, true))
++	{
++	  unsigned int regno = REGNO (original);
++	  if (lra_dump_file != NULL)
++	    {
++	      fprintf (lra_dump_file, "	 Reuse r%d for output ", regno);
++	      dump_value_slim (lra_dump_file, original, 1);
++	    }
++	  if (new_class != lra_get_allocno_class (regno))
++	    lra_change_class (regno, new_class, ", change to", false);
++	  if (lra_dump_file != NULL)
++	    fprintf (lra_dump_file, "\n");
++	  *result_reg = original;
++	  return false;
++	}
+       *result_reg
+ 	= lra_create_new_reg_with_unique_value (mode, original, rclass, title);
+       return true;
+diff --git a/gcc/testsuite/gcc.c-torture/compile/pr96796.c b/gcc/testsuite/gcc.c-torture/compile/pr96796.c
+new file mode 100644
+index 00000000000..8808e62fe77
+--- /dev/null
++++ b/gcc/testsuite/gcc.c-torture/compile/pr96796.c
+@@ -0,0 +1,55 @@
++/* { dg-additional-options "-fcommon" } */
++
++struct S0 {
++  signed f0 : 8;
++  unsigned f1;
++  unsigned f4;
++};
++struct S1 {
++  long f3;
++  char f4;
++} g_3_4;
++
++int g_5, func_1_l_32, func_50___trans_tmp_31;
++static struct S0 g_144, g_834, g_1255, g_1261;
++
++int g_273[120] = {};
++int *g_555;
++char **g_979;
++static int g_1092_0;
++static int g_1193;
++int safe_mul_func_int16_t_s_s(int si1, int si2) { return si1 * si2; }
++static struct S0 *func_50();
++int func_1() { func_50(g_3_4, g_5, func_1_l_32, 8, 3); }
++void safe_div_func_int64_t_s_s(int *);
++void safe_mod_func_uint32_t_u_u(struct S0);
++struct S0 *func_50(int p_51, struct S0 p_52, struct S1 p_53, int p_54,
++                   int p_55) {
++  int __trans_tmp_30;
++  char __trans_tmp_22;
++  short __trans_tmp_19;
++  long l_985_1;
++  long l_1191[8];
++  safe_div_func_int64_t_s_s(g_273);
++  __builtin_printf((char*)g_1261.f4);
++  safe_mod_func_uint32_t_u_u(g_834);
++  g_144.f0 += 1;
++  for (;;) {
++    struct S1 l_1350 = {&l_1350};
++    for (; p_53.f3; p_53.f3 -= 1)
++      for (; g_1193 <= 2; g_1193 += 1) {
++        __trans_tmp_19 = safe_mul_func_int16_t_s_s(l_1191[l_985_1 + p_53.f3],
++                                                   p_55 % (**g_979 = 10));
++        __trans_tmp_22 = g_1255.f1 * p_53.f4;
++        __trans_tmp_30 = __trans_tmp_19 + __trans_tmp_22;
++        if (__trans_tmp_30)
++          g_1261.f0 = p_51;
++        else {
++          g_1255.f0 = p_53.f3;
++          int *l_1422 = g_834.f0 = g_144.f4 != (*l_1422)++ > 0 < 0 ^ 51;
++          g_555 = ~0;
++          g_1092_0 |= func_50___trans_tmp_31;
++        }
++      }
++  }
++}

SOURCES/gcc8-pr99074.patch

@@ -0,0 +1,77 @@
+commit 6d134ca4b963706f31251f061fc180e517b32546
+Author: Martin Sebor <msebor@redhat.com>
+Date:   Tue Feb 23 14:09:00 2021 -0700
+
+    PR c++/99074 - crash in dynamic_cast<>() on null pointer
+    
+    libstdc++-v3/ChangeLog:
+    
+            PR c++/99074
+            * libsupc++/dyncast.cc (__dynamic_cast): Return null when
+            first argument is null.
+    
+    gcc/testsuite/ChangeLog:
+    
+            PR c++/99074
+            * g++.dg/warn/Wnonnull11.C: New test.
+
+diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull11.C b/gcc/testsuite/g++.dg/warn/Wnonnull11.C
+new file mode 100644
+index 00000000000..5f1b69d9a41
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/warn/Wnonnull11.C
+@@ -0,0 +1,40 @@
++/* PR c++/99074 - gcc 8 and above is crashing with dynamic_cast<>() on null
++   pointer with optimization level -O1 and above
++   { dg-do run }
++   { dg-options "-O1 -Wall" } */
++
++class Base
++{
++public:
++  virtual ~Base() {}
++  virtual void op() = 0;
++};
++
++class Object: public virtual Base { };
++
++class AbstractBase: public virtual Base
++{
++public:
++  Object* _to_object ()
++  {
++    return dynamic_cast<Object*>(this);   // { dg-warning "\\\[-Wnonnull" "" { xfail *-*-* } }
++  }
++};
++
++class MyAbstractClass: public virtual AbstractBase
++{
++public:
++  static MyAbstractClass* _nil () { return 0; }
++};
++
++
++int main ()
++{
++  MyAbstractClass *my_abs_type = MyAbstractClass::_nil ();
++  AbstractBase *abs_base = my_abs_type;
++  Object *obj = abs_base->_to_object ();
++
++  __builtin_printf ("object is: %p\n", obj);
++
++  return 0;
++}
+diff --git a/libstdc++-v3/libsupc++/dyncast.cc b/libstdc++-v3/libsupc++/dyncast.cc
+index b7d98495ad3..f8f707ee4d4 100644
+--- a/libstdc++-v3/libsupc++/dyncast.cc
++++ b/libstdc++-v3/libsupc++/dyncast.cc
+@@ -47,6 +47,9 @@ __dynamic_cast (const void *src_ptr,    // object started from
+                 const __class_type_info *dst_type, // desired target type
+                 ptrdiff_t src2dst) // how src and dst are related
+   {
++  if (!src_ptr)
++    /* Handle precondition violations gracefully.  */
++    return NULL;
+   const void *vtable = *static_cast <const void *const *> (src_ptr);
+   const vtable_prefix *prefix =
+       adjust_pointer <vtable_prefix> (vtable, 

SOURCES/gcc8-pr99536.patch

@@ -0,0 +1,47 @@
+commit 29dad307b5d7cfdb6626c11c8e43ebff941c950b
+Author: Jonathan Wakely <jwakely@redhat.com>
+Date:   Thu Mar 11 16:43:51 2021 +0000
+
+    libstdc++: Initialize std::normal_distribution::_M_saved [PR 99536]
+    
+    This avoids a false positive -Wmaybe-uninitialized warning, by
+    initializing _M_saved on construction.
+    
+    libstdc++-v3/ChangeLog:
+    
+            PR libstdc++/99536
+            * include/bits/random.h (normal_distribution): Use
+            default-initializer for _M_saved and _M_saved_available.
+    
+    (cherry picked from commit 67e397660611990efd98f9e4106c1ee81f6803a4)
+
+diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h
+index b36781ed290..3385345d273 100644
+--- a/libstdc++-v3/include/bits/random.h
++++ b/libstdc++-v3/include/bits/random.h
+@@ -1974,12 +1974,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+       explicit
+       normal_distribution(result_type __mean = result_type(0),
+ 			  result_type __stddev = result_type(1))
+-      : _M_param(__mean, __stddev), _M_saved_available(false)
++      : _M_param(__mean, __stddev)
+       { }
+ 
+       explicit
+       normal_distribution(const param_type& __p)
+-      : _M_param(__p), _M_saved_available(false)
++      : _M_param(__p)
+       { }
+ 
+       /**
+@@ -2158,8 +2158,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ 			const param_type& __p);
+ 
+       param_type  _M_param;
+-      result_type _M_saved;
+-      bool        _M_saved_available;
++      result_type _M_saved = 0;
++      bool        _M_saved_available = false;
+     };
+ 
+   /**

SOURCES/gcc8-rh1512529-aarch64.patch

@@ -0,0 +1,445 @@
+--- gcc/config/aarch64/aarch64.c
++++ gcc/config/aarch64/aarch64.c
+@@ -3799,7 +3799,14 @@ aarch64_output_probe_stack_range (rtx reg1, rtx reg2)
+   output_asm_insn ("sub\t%0, %0, %1", xops);
+ 
+   /* Probe at TEST_ADDR.  */
+-  output_asm_insn ("str\txzr, [%0]", xops);
++  if (flag_stack_clash_protection)
++    {
++      gcc_assert (xops[0] == stack_pointer_rtx);
++      xops[1] = GEN_INT (PROBE_INTERVAL - 8);
++      output_asm_insn ("str\txzr, [%0, %1]", xops);
++    }
++  else
++    output_asm_insn ("str\txzr, [%0]", xops);
+ 
+   /* Test if TEST_ADDR == LAST_ADDR.  */
+   xops[1] = reg2;
+@@ -4589,6 +4596,133 @@ aarch64_set_handled_components (sbitmap components)
+       cfun->machine->reg_is_wrapped_separately[regno] = true;
+ }
+ 
++/* Allocate POLY_SIZE bytes of stack space using TEMP1 and TEMP2 as scratch
++   registers.  */
++
++static void
++aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2,
++					poly_int64 poly_size)
++{
++  HOST_WIDE_INT size;
++  if (!poly_size.is_constant (&size))
++    {
++      sorry ("stack probes for SVE frames");
++      return;
++    }
++
++  HOST_WIDE_INT probe_interval
++    = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++  HOST_WIDE_INT guard_size
++    = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE);
++  HOST_WIDE_INT guard_used_by_caller = 1024;
++
++  /* SIZE should be large enough to require probing here.  ie, it
++     must be larger than GUARD_SIZE - GUARD_USED_BY_CALLER.
++
++     We can allocate GUARD_SIZE - GUARD_USED_BY_CALLER as a single chunk
++     without any probing.  */
++  gcc_assert (size >= guard_size - guard_used_by_caller);
++  aarch64_sub_sp (temp1, temp2, guard_size - guard_used_by_caller, true);
++  HOST_WIDE_INT orig_size = size;
++  size -= (guard_size - guard_used_by_caller);
++
++  HOST_WIDE_INT rounded_size = size & -probe_interval;
++  HOST_WIDE_INT residual = size - rounded_size;
++
++  /* We can handle a small number of allocations/probes inline.  Otherwise
++     punt to a loop.  */
++  if (rounded_size && rounded_size <= 4 * probe_interval)
++    {
++      /* We don't use aarch64_sub_sp here because we don't want to
++	 repeatedly load TEMP1.  */
++      rtx step = GEN_INT (-probe_interval);
++      if (probe_interval > ARITH_FACTOR)
++	{
++	  emit_move_insn (temp1, step);
++	  step = temp1;
++	}
++
++      for (HOST_WIDE_INT i = 0; i < rounded_size; i += probe_interval)
++	{
++	  rtx_insn *insn = emit_insn (gen_add2_insn (stack_pointer_rtx, step));
++          add_reg_note (insn, REG_STACK_CHECK, const0_rtx);
++
++	  if (probe_interval > ARITH_FACTOR)
++	    {
++	      RTX_FRAME_RELATED_P (insn) = 1;
++	      rtx adj = plus_constant (Pmode, stack_pointer_rtx, -probe_interval);
++	      add_reg_note (insn, REG_CFA_ADJUST_CFA,
++			    gen_rtx_SET (stack_pointer_rtx, adj));
++	    }
++
++	  emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++					   (probe_interval
++					    - GET_MODE_SIZE (word_mode))));
++	  emit_insn (gen_blockage ());
++	}
++      dump_stack_clash_frame_info (PROBE_INLINE, size != rounded_size);
++    }
++  else if (rounded_size)
++    {
++      /* Compute the ending address.  */
++      unsigned int scratchreg = REGNO (temp1);
++      emit_move_insn (temp1, GEN_INT (-rounded_size));
++      rtx_insn *insn
++	 = emit_insn (gen_add3_insn (temp1, stack_pointer_rtx, temp1));
++
++      /* For the initial allocation, we don't have a frame pointer
++	 set up, so we always need CFI notes.  If we're doing the
++	 final allocation, then we may have a frame pointer, in which
++	 case it is the CFA, otherwise we need CFI notes.
++
++	 We can determine which allocation we are doing by looking at
++	 the temporary register.  IP0 is the initial allocation, IP1
++	 is the final allocation.  */
++      if (scratchreg == IP0_REGNUM || !frame_pointer_needed)
++	{
++	  /* We want the CFA independent of the stack pointer for the
++	     duration of the loop.  */
++	  add_reg_note (insn, REG_CFA_DEF_CFA,
++			plus_constant (Pmode, temp1,
++				       (rounded_size + (orig_size - size))));
++	  RTX_FRAME_RELATED_P (insn) = 1;
++	}
++
++      /* This allocates and probes the stack.
++
++	 It also probes at a 4k interval regardless of the value of
++	 PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL.  */
++      insn = emit_insn (gen_probe_stack_range (stack_pointer_rtx,
++					       stack_pointer_rtx, temp1));
++
++      /* Now reset the CFA register if needed.  */
++      if (scratchreg == IP0_REGNUM || !frame_pointer_needed)
++	{
++	  add_reg_note (insn, REG_CFA_DEF_CFA,
++			plus_constant (Pmode, stack_pointer_rtx,
++				       (rounded_size + (orig_size - size))));
++	  RTX_FRAME_RELATED_P (insn) = 1;
++	}
++
++      emit_insn (gen_blockage ());
++      dump_stack_clash_frame_info (PROBE_LOOP, size != rounded_size);
++    }
++  else
++    dump_stack_clash_frame_info (PROBE_INLINE, size != rounded_size);
++
++  /* Handle any residuals.
++     Note that any residual must be probed.  */
++  if (residual)
++    {
++      aarch64_sub_sp (temp1, temp2, residual, true);
++      add_reg_note (get_last_insn (), REG_STACK_CHECK, const0_rtx);
++      emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++				       (residual - GET_MODE_SIZE (word_mode))));
++      emit_insn (gen_blockage ());
++    }
++  return;
++}
++
+ /* Add a REG_CFA_EXPRESSION note to INSN to say that register REG
+    is saved at BASE + OFFSET.  */
+ 
+@@ -4686,7 +4820,54 @@ aarch64_expand_prologue (void)
+   rtx ip0_rtx = gen_rtx_REG (Pmode, IP0_REGNUM);
+   rtx ip1_rtx = gen_rtx_REG (Pmode, IP1_REGNUM);
+ 
+-  aarch64_sub_sp (ip0_rtx, ip1_rtx, initial_adjust, true);
++  /* We do not fully protect aarch64 against stack clash style attacks
++     as doing so would be prohibitively expensive with less utility over
++     time as newer compilers are deployed.
++
++     We assume the guard is at least 64k.  Furthermore, we assume that
++     the caller has not pushed the stack pointer more than 1k into
++     the guard.  A caller that pushes the stack pointer than 1k into
++     the guard is considered invalid.
++
++     Note that the caller's ability to push the stack pointer into the
++     guard is a function of the number and size of outgoing arguments and/or
++     dynamic stack allocations due to the mandatory save of the link register
++     in the caller's frame.
++
++     With those assumptions the callee can allocate up to 63k of stack
++     space without probing.
++
++     When probing is needed, we emit a probe at the start of the prologue
++     and every PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL bytes thereafter.
++
++     We have to track how much space has been allocated, but we do not
++     track stores into the stack as implicit probes except for the
++     fp/lr store.  */
++  HOST_WIDE_INT guard_size
++    = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE);
++  HOST_WIDE_INT guard_used_by_caller = 1024;
++  if (flag_stack_clash_protection)
++    {
++      if (known_eq (frame_size, 0))
++	dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
++      else if (known_lt (initial_adjust, guard_size - guard_used_by_caller)
++	       && known_lt (final_adjust, guard_size - guard_used_by_caller))
++	dump_stack_clash_frame_info (NO_PROBE_SMALL_FRAME, true);
++    }
++
++  /* In theory we should never have both an initial adjustment
++     and a callee save adjustment.  Verify that is the case since the
++     code below does not handle it for -fstack-clash-protection.  */
++  gcc_assert (known_eq (initial_adjust, 0) || callee_adjust == 0);
++
++  /* Only probe if the initial adjustment is larger than the guard
++     less the amount of the guard reserved for use by the caller's
++     outgoing args.  */
++  if (flag_stack_clash_protection
++      && maybe_ge (initial_adjust, guard_size - guard_used_by_caller))
++    aarch64_allocate_and_probe_stack_space (ip0_rtx, ip1_rtx, initial_adjust);
++  else
++    aarch64_sub_sp (ip0_rtx, ip1_rtx, initial_adjust, true);
+ 
+   if (callee_adjust != 0)
+     aarch64_push_regs (reg1, reg2, callee_adjust);
+@@ -4742,7 +4923,31 @@ aarch64_expand_prologue (void)
+ 			     callee_adjust != 0 || emit_frame_chain);
+   aarch64_save_callee_saves (DFmode, callee_offset, V0_REGNUM, V31_REGNUM,
+ 			     callee_adjust != 0 || emit_frame_chain);
+-  aarch64_sub_sp (ip1_rtx, ip0_rtx, final_adjust, !frame_pointer_needed);
++
++  /* We may need to probe the final adjustment as well.  */
++  if (flag_stack_clash_protection && maybe_ne (final_adjust, 0))
++    {
++      /* First probe if the final adjustment is larger than the guard size
++	 less the amount of the guard reserved for use by the caller's
++	 outgoing args.  */
++      if (maybe_ge (final_adjust, guard_size - guard_used_by_caller))
++	aarch64_allocate_and_probe_stack_space (ip1_rtx, ip0_rtx,
++						final_adjust);
++      else
++	aarch64_sub_sp (ip1_rtx, ip0_rtx, final_adjust, !frame_pointer_needed);
++
++      /* We must also probe if the final adjustment is larger than the guard
++	 that is assumed used by the caller.  This may be sub-optimal.  */
++      if (maybe_ge (final_adjust, guard_used_by_caller))
++	{
++	  if (dump_file)
++	    fprintf (dump_file,
++		     "Stack clash aarch64 large outgoing arg, probing\n");
++	  emit_stack_probe (stack_pointer_rtx);
++	}
++    }
++  else
++    aarch64_sub_sp (ip1_rtx, ip0_rtx, final_adjust, !frame_pointer_needed);
+ }
+ 
+ /* Return TRUE if we can use a simple_return insn.
+@@ -10476,6 +10681,12 @@ aarch64_override_options_internal (struct gcc_options *opts)
+       && opts->x_optimize >= aarch64_tune_params.prefetch->default_opt_level)
+     opts->x_flag_prefetch_loop_arrays = 1;
+ 
++  /* We assume the guard page is 64k.  */
++  maybe_set_param_value (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE,
++			 16,
++			 opts->x_param_values,
++			 global_options_set.x_param_values);
++
+   aarch64_override_options_after_change_1 (opts);
+ }
+ 
+@@ -17161,6 +17372,28 @@ aarch64_sched_can_speculate_insn (rtx_insn *insn)
+     }
+ }
+ 
++/* It has been decided that to allow up to 1kb of outgoing argument
++   space to be allocated w/o probing.  If more than 1kb of outgoing
++   argment space is allocated, then it must be probed and the last
++   probe must occur no more than 1kbyte away from the end of the
++   allocated space.
++
++   This implies that the residual part of an alloca allocation may
++   need probing in cases where the generic code might not otherwise
++   think a probe is needed.
++
++   This target hook returns TRUE when allocating RESIDUAL bytes of
++   alloca space requires an additional probe, otherwise FALSE is
++   returned.  */
++
++static bool
++aarch64_stack_clash_protection_final_dynamic_probe (rtx residual)
++{
++  return (residual == CONST0_RTX (Pmode)
++	  || GET_CODE (residual) != CONST_INT
++	  || INTVAL (residual) >= 1024);
++}
++
+ /* Implement TARGET_COMPUTE_PRESSURE_CLASSES.  */
+ 
+ static int
+@@ -17669,6 +17902,10 @@ aarch64_libgcc_floating_mode_supported_p
+ #undef TARGET_CONSTANT_ALIGNMENT
+ #define TARGET_CONSTANT_ALIGNMENT aarch64_constant_alignment
+ 
++#undef TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE
++#define TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE \
++  aarch64_stack_clash_protection_final_dynamic_probe
++
+ #undef TARGET_COMPUTE_PRESSURE_CLASSES
+ #define TARGET_COMPUTE_PRESSURE_CLASSES aarch64_compute_pressure_classes
+ 
+--- gcc/config/aarch64/aarch64.md
++++ gcc/config/aarch64/aarch64.md
+@@ -5812,7 +5812,7 @@
+ )
+ 
+ (define_insn "probe_stack_range"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
++  [(set (match_operand:DI 0 "register_operand" "=rk")
+ 	(unspec_volatile:DI [(match_operand:DI 1 "register_operand" "0")
+ 			     (match_operand:DI 2 "register_operand" "r")]
+ 			      UNSPECV_PROBE_STACK_RANGE))]
+--- gcc/testsuite/gcc.target/aarch64/stack-check-12.c
++++ gcc/testsuite/gcc.target/aarch64/stack-check-12.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++extern void arf (unsigned long int *, unsigned long int *);
++void
++frob ()
++{
++  unsigned long int num[1000];
++  unsigned long int den[1000];
++  arf (den, num);
++}
++
++/* This verifies that the scheduler did not break the dependencies
++   by adjusting the offsets within the probe and that the scheduler
++   did not reorder around the stack probes.  */
++/* { dg-final { scan-assembler-times "sub\\tsp, sp, #4096\\n\\tstr\\txzr, .sp, 4088." 3 } } */
++
++
++
+--- gcc/testsuite/gcc.target/aarch64/stack-check-13.c
++++ gcc/testsuite/gcc.target/aarch64/stack-check-13.c
+@@ -0,0 +1,28 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++#define ARG32(X) X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X
++#define ARG192(X) ARG32(X),ARG32(X),ARG32(X),ARG32(X),ARG32(X),ARG32(X)
++void out1(ARG192(__int128));
++int t1(int);
++
++int t3(int x)
++{
++  if (x < 1000)
++    return t1 (x) + 1;
++
++  out1 (ARG192(1));
++  return 0;
++}
++
++
++
++/* This test creates a large (> 1k) outgoing argument area that needs
++   to be probed.  We don't test the exact size of the space or the
++   exact offset to make the test a little less sensitive to trivial
++   output changes.  */
++/* { dg-final { scan-assembler-times "sub\\tsp, sp, #....\\n\\tstr\\txzr, \\\[sp" 1 } } */
++
++
++
+--- gcc/testsuite/gcc.target/aarch64/stack-check-14.c
++++ gcc/testsuite/gcc.target/aarch64/stack-check-14.c
+@@ -0,0 +1,25 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int t1(int);
++
++int t2(int x)
++{
++  char *p = __builtin_alloca (4050);
++  x = t1 (x);
++  return p[x];
++}
++
++
++/* This test has a constant sized alloca that is smaller than the
++   probe interval.  But it actually requires two probes instead
++   of one because of the optimistic assumptions we made in the
++   aarch64 prologue code WRT probing state. 
++
++   The form can change quite a bit so we just check for two
++   probes without looking at the actual address.  */
++/* { dg-final { scan-assembler-times "str\\txzr," 2 } } */
++
++
++
+--- gcc/testsuite/gcc.target/aarch64/stack-check-15.c
++++ gcc/testsuite/gcc.target/aarch64/stack-check-15.c
+@@ -0,0 +1,24 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int t1(int);
++
++int t2(int x)
++{
++  char *p = __builtin_alloca (x);
++  x = t1 (x);
++  return p[x];
++}
++
++
++/* This test has a variable sized alloca.  It requires 3 probes.
++   One in the loop, one for the residual and at the end of the
++   alloca area. 
++
++   The form can change quite a bit so we just check for two
++   probes without looking at the actual address.  */
++/* { dg-final { scan-assembler-times "str\\txzr," 3 } } */
++
++
++
+--- gcc/testsuite/lib/target-supports.exp
++++ gcc/testsuite/lib/target-supports.exp
+@@ -9201,14 +9201,9 @@ proc check_effective_target_autoincdec { } {
+ # 
+ proc check_effective_target_supports_stack_clash_protection { } {
+ 
+-   # Temporary until the target bits are fully ACK'd.
+-#  if { [istarget aarch*-*-*] } {
+-#	return 1
+-#  }
+-
+     if { [istarget x86_64-*-*] || [istarget i?86-*-*] 
+ 	  || [istarget powerpc*-*-*] || [istarget rs6000*-*-*]
+-	  || [istarget s390*-*-*] } {
++	  || [istarget aarch64*-**] || [istarget s390*-*-*] } {
+ 	return 1
+     }
+   return 0
+@@ -9217,9 +9212,9 @@ proc check_effective_target_supports_stack_clash_protection { } {
+ # Return 1 if the target creates a frame pointer for non-leaf functions
+ # Note we ignore cases where we apply tail call optimization here.
+ proc check_effective_target_frame_pointer_for_non_leaf { } {
+-  if { [istarget aarch*-*-*] } {
+-	return 1
+-  }
++#  if { [istarget aarch*-*-*] } {
++#	return 1
++#  }
+ 
+   # Solaris/x86 defaults to -fno-omit-frame-pointer.
+   if { [istarget i?86-*-solaris*] || [istarget x86_64-*-solaris*] } {

SOURCES/gcc8-rh1574936.patch

@@ -12,7 +12,7 @@ these notes only confer that there is no other annobin markup.
 
 --- libgcc/Makefile.in	2018-01-13 13:05:41.000000000 +0100
 +++ libgcc/Makefile.in	2018-07-25 13:15:02.036226940 +0200
-@@ -246,6 +246,7 @@ LIBGCC2_DEBUG_CFLAGS = -g
+@@ -244,6 +244,7 @@
  LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
  		 $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
  		 -fbuilding-libgcc -fno-stack-protector \
@@ -20,11 +20,12 @@ these notes only confer that there is no other annobin markup.
  		 $(INHIBIT_LIBC_CFLAGS)
  
  # Additional options to use when compiling libgcc2.a.
-@@ -301,6 +302,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(IN
+@@ -297,6 +298,7 @@
    $(NO_PIE_CFLAGS) -finhibit-size-directive -fno-inline -fno-exceptions \
    -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
    -fbuilding-libgcc -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \
 +  -Wa,--generate-missing-build-notes=yes \
-   $(INHIBIT_LIBC_CFLAGS) $(USE_TM_CLONE_REGISTRY)
+   $(INHIBIT_LIBC_CFLAGS)
  
  # Extra flags to use when compiling crt{begin,end}.o.
+

SOURCES/gcc8-rh1668903-1.patch

@@ -0,0 +1,406 @@
+commit 126dab7c9d84294f256b1f7bf91c24a9e7103249
+Author: qinzhao <qinzhao@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Thu Nov 29 16:06:03 2018 +0000
+
+    Add a new option -flive-patching={inline-only-static|inline-clone}
+    to support live patching in GCC.
+    
+    2018-11-29  qing zhao  <qing.zhao@oracle.com>
+    
+    gcc/ChangeLog:
+    
+            * cif-code.def (EXTERN_LIVE_ONLY_STATIC): New CIF code.
+            * common.opt: Add -flive-patching flag.
+            * doc/invoke.texi: Document -flive-patching.
+            * flag-types.h (enum live_patching_level): New enum.
+            * ipa-inline.c (can_inline_edge_p): Disable external functions from
+            inlining when flag_live_patching is LIVE_PATCHING_INLINE_ONLY_STATIC.
+            * opts.c (control_options_for_live_patching): New function.
+            (finish_options): Make flag_live_patching incompatible with flag_lto.
+            Control IPA optimizations based on different levels of
+            flag_live_patching.
+    
+    gcc/testsuite/ChangeLog:
+    
+            * gcc.dg/live-patching-1.c: New test.
+            * gcc.dg/live-patching-2.c: New test.
+            * gcc.dg/live-patching-3.c: New test.
+            * gcc.dg/tree-ssa/writeonly-3.c: New test.
+            * gcc.target/i386/ipa-stack-alignment-2.c: New test.
+    
+    
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266627 138bc75d-0d04-0410-961f-82ee72b054a4
+
+--- gcc/cif-code.def
++++ gcc/cif-code.def
+@@ -132,6 +132,12 @@ DEFCIFCODE(USES_COMDAT_LOCAL, CIF_FINAL_ERROR,
+ DEFCIFCODE(ATTRIBUTE_MISMATCH, CIF_FINAL_ERROR,
+ 	   N_("function attribute mismatch"))
+ 
++/* We can't inline because the user requests only static functions
++   but the function has external linkage for live patching purpose.  */
++DEFCIFCODE(EXTERN_LIVE_ONLY_STATIC, CIF_FINAL_ERROR,
++	   N_("function has external linkage when the user requests only"
++	      " inlining static for live patching"))
++
+ /* We proved that the call is unreachable.  */
+ DEFCIFCODE(UNREACHABLE, CIF_FINAL_ERROR,
+ 	   N_("unreachable"))
+--- gcc/common.opt
++++ gcc/common.opt
+@@ -2181,6 +2181,24 @@ starts and when the destructor finishes.
+ flifetime-dse=
+ Common Joined RejectNegative UInteger Var(flag_lifetime_dse) Optimization IntegerRange(0, 2)
+ 
++flive-patching
++Common RejectNegative Alias(flive-patching=,inline-clone) Optimization
++
++flive-patching=
++Common Report Joined RejectNegative Enum(live_patching_level) Var(flag_live_patching) Init(LIVE_PATCHING_NONE) Optimization
++-flive-patching=[inline-only-static|inline-clone]	Control IPA
++optimizations to provide a safe compilation for live-patching.  At the same
++time, provides multiple-level control on the enabled IPA optimizations.
++
++Enum
++Name(live_patching_level) Type(enum live_patching_level) UnknownError(unknown Live-Patching Level %qs)
++
++EnumValue
++Enum(live_patching_level) String(inline-only-static) Value(LIVE_PATCHING_INLINE_ONLY_STATIC)
++
++EnumValue
++Enum(live_patching_level) String(inline-clone) Value(LIVE_PATCHING_INLINE_CLONE)
++
+ flive-range-shrinkage
+ Common Report Var(flag_live_range_shrinkage) Init(0) Optimization
+ Relief of register pressure through live range shrinkage.
+--- gcc/doc/invoke.texi
++++ gcc/doc/invoke.texi
+@@ -389,6 +389,7 @@ Objective-C and Objective-C++ Dialects}.
+ -fipa-bit-cp -fipa-vrp @gol
+ -fipa-pta  -fipa-profile  -fipa-pure-const  -fipa-reference  -fipa-icf @gol
+ -fira-algorithm=@var{algorithm} @gol
++-flive-patching=@var{level} @gol
+ -fira-region=@var{region}  -fira-hoist-pressure @gol
+ -fira-loop-pressure  -fno-ira-share-save-slots @gol
+ -fno-ira-share-spill-slots @gol
+@@ -9291,6 +9292,65 @@ equivalences that are found only by GCC and equivalences found only by Gold.
+ 
+ This flag is enabled by default at @option{-O2} and @option{-Os}.
+ 
++@item -flive-patching=@var{level}
++@opindex flive-patching
++Control GCC's optimizations to provide a safe compilation for live-patching.
++
++If the compiler's optimization uses a function's body or information extracted
++from its body to optimize/change another function, the latter is called an
++impacted function of the former.  If a function is patched, its impacted
++functions should be patched too.
++
++The impacted functions are decided by the compiler's interprocedural
++optimizations.  For example, inlining a function into its caller, cloning
++a function and changing its caller to call this new clone, or extracting
++a function's pureness/constness information to optimize its direct or
++indirect callers, etc.
++
++Usually, the more IPA optimizations enabled, the larger the number of
++impacted functions for each function.  In order to control the number of
++impacted functions and computed the list of impacted function easily,
++we provide control to partially enable IPA optimizations on two different
++levels.
++
++The @var{level} argument should be one of the following:
++
++@table @samp
++
++@item inline-clone
++
++Only enable inlining and cloning optimizations, which includes inlining,
++cloning, interprocedural scalar replacement of aggregates and partial inlining.
++As a result, when patching a function, all its callers and its clones'
++callers need to be patched as well.
++
++@option{-flive-patching=inline-clone} disables the following optimization flags:
++@gccoptlist{-fwhole-program  -fipa-pta  -fipa-reference  -fipa-ra @gol
++-fipa-icf  -fipa-icf-functions  -fipa-icf-variables @gol
++-fipa-bit-cp  -fipa-vrp  -fipa-pure-const  -fipa-reference-addressable @gol
++-fipa-stack-alignment}
++
++@item inline-only-static
++
++Only enable inlining of static functions.
++As a result, when patching a static function, all its callers need to be
++patches as well.
++
++In addition to all the flags that -flive-patching=inline-clone disables,
++@option{-flive-patching=inline-only-static} disables the following additional
++optimization flags:
++@gccoptlist{-fipa-cp-clone  -fipa-sra  -fpartial-inlining  -fipa-cp}
++
++@end table
++
++When -flive-patching specified without any value, the default value
++is "inline-clone".
++
++This flag is disabled by default.
++
++Note that -flive-patching is not supported with link-time optimizer.
++(@option{-flto}).
++
+ @item -fisolate-erroneous-paths-dereference
+ @opindex fisolate-erroneous-paths-dereference
+ Detect paths that trigger erroneous or undefined behavior due to
+--- gcc/flag-types.h
++++ gcc/flag-types.h
+@@ -123,6 +123,14 @@ enum stack_reuse_level
+   SR_ALL
+ };
+ 
++/* The live patching level.  */
++enum live_patching_level
++{
++  LIVE_PATCHING_NONE = 0,
++  LIVE_PATCHING_INLINE_ONLY_STATIC,
++  LIVE_PATCHING_INLINE_CLONE
++};
++
+ /* The algorithm used for basic block reordering.  */
+ enum reorder_blocks_algorithm
+ {
+--- gcc/ipa-inline.c
++++ gcc/ipa-inline.c
+@@ -379,6 +379,12 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
+       e->inline_failed = CIF_ATTRIBUTE_MISMATCH;
+       inlinable = false;
+     }
++  else if (callee->externally_visible
++	   && flag_live_patching == LIVE_PATCHING_INLINE_ONLY_STATIC)
++    {
++      e->inline_failed = CIF_EXTERN_LIVE_ONLY_STATIC;
++      inlinable = false;
++    }
+   if (!inlinable && report)
+     report_inline_failed_reason (e);
+   return inlinable;
+--- gcc/opts.c
++++ gcc/opts.c
+@@ -699,6 +699,152 @@ default_options_optimization (struct gcc
+ 			 lang_mask, handlers, loc, dc);
+ }
+ 
++/* Control IPA optimizations based on different live patching LEVEL.  */
++static void
++control_options_for_live_patching (struct gcc_options *opts,
++				   struct gcc_options *opts_set,
++				   enum live_patching_level level,
++				   location_t loc)
++{
++  gcc_assert (level > LIVE_PATCHING_NONE);
++
++  switch (level)
++    {
++    case LIVE_PATCHING_INLINE_ONLY_STATIC:
++      if (opts_set->x_flag_ipa_cp_clone && opts->x_flag_ipa_cp_clone)
++	error_at (loc,
++		  "%<-fipa-cp-clone%> is incompatible with "
++		  "%<-flive-patching=inline-only-static%>");
++      else
++	opts->x_flag_ipa_cp_clone = 0;
++
++      if (opts_set->x_flag_ipa_sra && opts->x_flag_ipa_sra)
++	error_at (loc,
++		  "%<-fipa-sra%> is incompatible with "
++		  "%<-flive-patching=inline-only-static%>");
++      else
++	opts->x_flag_ipa_sra = 0;
++
++      if (opts_set->x_flag_partial_inlining && opts->x_flag_partial_inlining)
++	error_at (loc,
++		  "%<-fpartial-inlining%> is incompatible with "
++		  "%<-flive-patching=inline-only-static%>");
++      else
++	opts->x_flag_partial_inlining = 0;
++
++      if (opts_set->x_flag_ipa_cp && opts->x_flag_ipa_cp)
++	error_at (loc,
++		  "%<-fipa-cp%> is incompatible with "
++		  "%<-flive-patching=inline-only-static%>");
++      else
++	opts->x_flag_ipa_cp = 0;
++
++      /* FALLTHROUGH.  */
++    case LIVE_PATCHING_INLINE_CLONE:
++      /* live patching should disable whole-program optimization.  */
++      if (opts_set->x_flag_whole_program && opts->x_flag_whole_program)
++	error_at (loc,
++		  "%<-fwhole-program%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_whole_program = 0;
++
++      /* visibility change should be excluded by !flag_whole_program
++	 && !in_lto_p && !flag_ipa_cp_clone && !flag_ipa_sra
++	 && !flag_partial_inlining.  */
++
++      if (opts_set->x_flag_ipa_pta && opts->x_flag_ipa_pta)
++	error_at (loc,
++		  "%<-fipa-pta%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_pta = 0;
++
++      if (opts_set->x_flag_ipa_reference && opts->x_flag_ipa_reference)
++	error_at (loc,
++		  "%<-fipa-reference%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_reference = 0;
++
++      if (opts_set->x_flag_ipa_ra && opts->x_flag_ipa_ra)
++	error_at (loc,
++		  "%<-fipa-ra%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_ra = 0;
++
++      if (opts_set->x_flag_ipa_icf && opts->x_flag_ipa_icf)
++	error_at (loc,
++		  "%<-fipa-icf%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_icf = 0;
++
++      if (opts_set->x_flag_ipa_icf_functions && opts->x_flag_ipa_icf_functions)
++	error_at (loc,
++		  "%<-fipa-icf-functions%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_icf_functions = 0;
++
++      if (opts_set->x_flag_ipa_icf_variables && opts->x_flag_ipa_icf_variables)
++	error_at (loc,
++		  "%<-fipa-icf-variables%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_icf_variables = 0;
++
++      if (opts_set->x_flag_ipa_bit_cp && opts->x_flag_ipa_bit_cp)
++	error_at (loc,
++		  "%<-fipa-bit-cp%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_bit_cp = 0;
++
++      if (opts_set->x_flag_ipa_vrp && opts->x_flag_ipa_vrp)
++	error_at (loc,
++		  "%<-fipa-vrp%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_vrp = 0;
++
++      if (opts_set->x_flag_ipa_pure_const && opts->x_flag_ipa_pure_const)
++	error_at (loc,
++		  "%<-fipa-pure-const%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_pure_const = 0;
++
++      /* FIXME: disable unreachable code removal.  */
++
++      /* discovery of functions/variables with no address taken.  */
++// GCC 8 doesn't have these options.
++#if 0
++      if (opts_set->x_flag_ipa_reference_addressable
++	  && opts->x_flag_ipa_reference_addressable)
++	error_at (loc,
++		  "%<-fipa-reference-addressable%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_reference_addressable = 0;
++
++      /* ipa stack alignment propagation.  */
++      if (opts_set->x_flag_ipa_stack_alignment
++	  && opts->x_flag_ipa_stack_alignment)
++	error_at (loc,
++		  "%<-fipa-stack-alignment%> is incompatible with "
++		  "%<-flive-patching=inline-only-static|inline-clone%>");
++      else
++	opts->x_flag_ipa_stack_alignment = 0;
++#endif
++
++      break;
++    default:
++      gcc_unreachable ();
++    }
++}
++
+ /* After all options at LOC have been read into OPTS and OPTS_SET,
+    finalize settings of those options and diagnose incompatible
+    combinations.  */
+@@ -1057,6 +1203,18 @@ finish_options (struct gcc_options *opts
+     sorry ("transactional memory is not supported with "
+ 	   "%<-fsanitize=kernel-address%>");
+ 
++  /* Currently live patching is not support for LTO.  */
++  if (opts->x_flag_live_patching && opts->x_flag_lto)
++    sorry ("live patching is not supported with LTO");
++
++  /* Control IPA optimizations based on different -flive-patching level.  */
++  if (opts->x_flag_live_patching)
++    {
++      control_options_for_live_patching (opts, opts_set,
++					 opts->x_flag_live_patching,
++					 loc);
++    }
++
+   /* Comes from final.c -- no real reason to change it.  */
+ #define MAX_CODE_ALIGN 16
+ #define MAX_CODE_ALIGN_VALUE (1 << MAX_CODE_ALIGN)
+--- /dev/null
++++ gcc/testsuite/gcc.dg/live-patching-1.c
+@@ -0,0 +1,22 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -flive-patching=inline-only-static -fdump-ipa-inline" } */
++
++extern int sum, n, m;
++
++int foo (int a)
++{
++  return a + n;
++}
++
++static int bar (int b)
++{
++  return b * m;
++}
++
++int main()
++{
++  sum = foo (m) + bar (n); 
++  return 0;
++}
++
++/* { dg-final { scan-ipa-dump "foo/0 function has external linkage when the user requests only inlining static for live patching"  "inline" } } */
+--- /dev/null
++++ gcc/testsuite/gcc.dg/live-patching-2.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -flive-patching -flto" } */
++
++int main()
++{
++  return 0;
++}
++
++/* { dg-message "sorry, unimplemented: live patching is not supported with LTO" "-flive-patching and -flto together" { target *-*-* } 0 } */
+--- /dev/null
++++ gcc/testsuite/gcc.dg/live-patching-3.c
+@@ -0,0 +1,9 @@
++/* { dg-do compile } */
++/* { dg-options "-O1 -flive-patching -fwhole-program" } */
++
++int main()
++{
++  return 0;
++}
++
++/* { dg-message "'-fwhole-program' is incompatible with '-flive-patching=inline-only-static|inline-clone’" "" {target "*-*-*"} 0 } */

SOURCES/gcc8-rh1668903-2.patch

@@ -0,0 +1,73 @@
+commit 9939b2f79bd9b75b99080a17f3d6f1214d543477
+Author: qinzhao <qinzhao@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Wed Apr 3 19:00:25 2019 +0000
+
+    2019-04-03  qing zhao  <qing.zhao@oracle.com>
+    
+            PR tree-optimization/89730
+            * ipa-inline.c (can_inline_edge_p): Delete the checking for
+            -flive-patching=inline-only-static.
+            (can_inline_edge_by_limits_p): Add the checking for
+            -flive-patching=inline-only-static and grant always_inline
+            even when -flive-patching=inline-only-static is specified.
+    
+            * gcc.dg/live-patching-4.c: New test.
+    
+    
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@270134 138bc75d-0d04-0410-961f-82ee72b054a4
+
+--- gcc/ipa-inline.c
++++ gcc/ipa-inline.c
+@@ -385,12 +385,6 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
+       e->inline_failed = CIF_ATTRIBUTE_MISMATCH;
+       inlinable = false;
+     }
+-  else if (callee->externally_visible
+-	   && flag_live_patching == LIVE_PATCHING_INLINE_ONLY_STATIC)
+-    {
+-      e->inline_failed = CIF_EXTERN_LIVE_ONLY_STATIC;
+-      inlinable = false;
+-    }
+   if (!inlinable && report)
+     report_inline_failed_reason (e);
+   return inlinable;
+@@ -433,6 +427,13 @@ can_inline_edge_by_limits_p (struct cgraph_edge *e, bool report,
+      		 DECL_ATTRIBUTES (caller->decl))
+       && !caller_growth_limits (e))
+     inlinable = false;
++  else if (callee->externally_visible
++	   && !DECL_DISREGARD_INLINE_LIMITS (callee->decl)
++	   && flag_live_patching == LIVE_PATCHING_INLINE_ONLY_STATIC)
++    {
++      e->inline_failed = CIF_EXTERN_LIVE_ONLY_STATIC;
++      inlinable = false;
++    }
+   /* Don't inline a function with a higher optimization level than the
+      caller.  FIXME: this is really just tip of iceberg of handling
+      optimization attribute.  */
+--- /dev/null
++++ gcc/testsuite/gcc.dg/live-patching-4.c
+@@ -0,0 +1,23 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -flive-patching=inline-only-static -fdump-tree-einline-optimized" } */
++
++extern int sum, n, m;
++
++extern inline __attribute__((always_inline)) int foo (int a);
++inline __attribute__((always_inline)) int foo (int a)
++{
++  return a + n;
++}
++
++static int bar (int b)
++{
++  return b * m;
++}
++
++int main()
++{
++  sum = foo (m) + bar (n); 
++  return 0;
++}
++
++/* { dg-final { scan-tree-dump "Inlining foo into main"  "einline" } } */

SOURCES/gcc8-rh1668903-3.patch

@@ -0,0 +1,85 @@
+commit 77e6311332590004c5aec82ceeb45e4d4d93f690
+Author: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Thu Apr 11 08:52:22 2019 +0000
+
+    Clarify documentation for -flive-patching
+    
+            * doc/invoke.texi (Optimize Options): Clarify -flive-patching docs.
+    
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@270276 138bc75d-0d04-0410-961f-82ee72b054a4
+
+--- gcc/doc/invoke.texi
++++ gcc/doc/invoke.texi
+@@ -9367,24 +9367,24 @@ This flag is enabled by default at @option{-O2} and @option{-Os}.
+ 
+ @item -flive-patching=@var{level}
+ @opindex flive-patching
+-Control GCC's optimizations to provide a safe compilation for live-patching.
++Control GCC's optimizations to produce output suitable for live-patching.
+ 
+ If the compiler's optimization uses a function's body or information extracted
+ from its body to optimize/change another function, the latter is called an
+ impacted function of the former.  If a function is patched, its impacted
+ functions should be patched too.
+ 
+-The impacted functions are decided by the compiler's interprocedural
+-optimizations.  For example, inlining a function into its caller, cloning
+-a function and changing its caller to call this new clone, or extracting
+-a function's pureness/constness information to optimize its direct or
+-indirect callers, etc.
++The impacted functions are determined by the compiler's interprocedural
++optimizations.  For example, a caller is impacted when inlining a function
++into its caller,
++cloning a function and changing its caller to call this new clone,
++or extracting a function's pureness/constness information to optimize
++its direct or indirect callers, etc.
+ 
+ Usually, the more IPA optimizations enabled, the larger the number of
+ impacted functions for each function.  In order to control the number of
+-impacted functions and computed the list of impacted function easily,
+-we provide control to partially enable IPA optimizations on two different
+-levels.
++impacted functions and more easily compute the list of impacted function,
++IPA optimizations can be partially enabled at two different levels.
+ 
+ The @var{level} argument should be one of the following:
+ 
+@@ -9395,7 +9395,7 @@ The @var{level} argument should be one of the following:
+ Only enable inlining and cloning optimizations, which includes inlining,
+ cloning, interprocedural scalar replacement of aggregates and partial inlining.
+ As a result, when patching a function, all its callers and its clones'
+-callers need to be patched as well.
++callers are impacted, therefore need to be patched as well.
+ 
+ @option{-flive-patching=inline-clone} disables the following optimization flags:
+ @gccoptlist{-fwhole-program  -fipa-pta  -fipa-reference  -fipa-ra @gol
+@@ -9406,22 +9406,23 @@ callers need to be patched as well.
+ @item inline-only-static
+ 
+ Only enable inlining of static functions.
+-As a result, when patching a static function, all its callers need to be
+-patches as well.
++As a result, when patching a static function, all its callers are impacted
++and so need to be patched as well.
+ 
+-In addition to all the flags that -flive-patching=inline-clone disables,
++In addition to all the flags that @option{-flive-patching=inline-clone}
++disables,
+ @option{-flive-patching=inline-only-static} disables the following additional
+ optimization flags:
+ @gccoptlist{-fipa-cp-clone  -fipa-sra  -fpartial-inlining  -fipa-cp}
+ 
+ @end table
+ 
+-When -flive-patching specified without any value, the default value
+-is "inline-clone".
++When @option{-flive-patching} is specified without any value, the default value
++is @var{inline-clone}.
+ 
+ This flag is disabled by default.
+ 
+-Note that -flive-patching is not supported with link-time optimizer.
++Note that @option{-flive-patching} is not supported with link-time optimization
+ (@option{-flto}).
+ 
+ @item -fisolate-erroneous-paths-dereference

SOURCES/gcc8-rh1670535.patch

@@ -0,0 +1,93 @@
+2018-11-08  Roman Geissler  <roman.geissler@amadeus.com>
+
+	* collect2.c (linker_select):  Add USE_LLD_LD.
+	(ld_suffixes): Add ld.lld.
+	(main): Handle -fuse-ld=lld.
+	* common.opt (-fuse-ld=lld): New option.
+	* doc/invoke.texi (-fuse-ld=lld): Document.
+	* opts.c (common_handle_option): Handle OPT_fuse_ld_lld.
+	
+--- gcc/collect2.c
++++ gcc/collect2.c
+@@ -831,6 +831,7 @@ main (int argc, char **argv)
+       USE_PLUGIN_LD,
+       USE_GOLD_LD,
+       USE_BFD_LD,
++      USE_LLD_LD,
+       USE_LD_MAX
+     } selected_linker = USE_DEFAULT_LD;
+   static const char *const ld_suffixes[USE_LD_MAX] =
+@@ -838,7 +839,8 @@ main (int argc, char **argv)
+       "ld",
+       PLUGIN_LD_SUFFIX,
+       "ld.gold",
+-      "ld.bfd"
++      "ld.bfd",
++      "ld.lld"
+     };
+   static const char *const real_ld_suffix = "real-ld";
+   static const char *const collect_ld_suffix = "collect-ld";
+@@ -1007,6 +1009,8 @@ main (int argc, char **argv)
+ 	  selected_linker = USE_BFD_LD;
+ 	else if (strcmp (argv[i], "-fuse-ld=gold") == 0)
+ 	  selected_linker = USE_GOLD_LD;
++  else if (strcmp (argv[i], "-fuse-ld=lld") == 0)
++    selected_linker = USE_LLD_LD;
+ 
+ #ifdef COLLECT_EXPORT_LIST
+ 	/* These flags are position independent, although their order
+@@ -1096,7 +1100,8 @@ main (int argc, char **argv)
+   /* Maybe we know the right file to use (if not cross).  */
+   ld_file_name = 0;
+ #ifdef DEFAULT_LINKER
+-  if (selected_linker == USE_BFD_LD || selected_linker == USE_GOLD_LD)
++  if (selected_linker == USE_BFD_LD || selected_linker == USE_GOLD_LD ||
++      selected_linker == USE_LLD_LD)
+     {
+       char *linker_name;
+ # ifdef HOST_EXECUTABLE_SUFFIX
+@@ -1315,7 +1320,7 @@ main (int argc, char **argv)
+ 	      else if (!use_collect_ld
+ 		       && strncmp (arg, "-fuse-ld=", 9) == 0)
+ 		{
+-		  /* Do not pass -fuse-ld={bfd|gold} to the linker. */
++		  /* Do not pass -fuse-ld={bfd|gold|lld} to the linker. */
+ 		  ld1--;
+ 		  ld2--;
+ 		}
+--- gcc/common.opt
++++ gcc/common.opt
+@@ -2732,6 +2732,10 @@ fuse-ld=gold
+ Common Driver Negative(fuse-ld=bfd)
+ Use the gold linker instead of the default linker.
+ 
++fuse-ld=lld
++Common Driver Negative(fuse-ld=lld)
++Use the lld LLVM linker instead of the default linker.
++
+ fuse-linker-plugin
+ Common Undocumented Var(flag_use_linker_plugin)
+ 
+--- gcc/doc/invoke.texi
++++ gcc/doc/invoke.texi
+@@ -12610,6 +12610,10 @@ Use the @command{bfd} linker instead of the default linker.
+ @opindex fuse-ld=gold
+ Use the @command{gold} linker instead of the default linker.
+ 
++@item -fuse-ld=lld
++@opindex fuse-ld=lld
++Use the LLVM @command{lld} linker instead of the default linker.
++
+ @cindex Libraries
+ @item -l@var{library}
+ @itemx -l @var{library}
+--- gcc/opts.c
++++ gcc/opts.c
+@@ -2557,6 +2557,7 @@ common_handle_option (struct gcc_options *opts,
+ 
+     case OPT_fuse_ld_bfd:
+     case OPT_fuse_ld_gold:
++    case OPT_fuse_ld_lld:
+     case OPT_fuse_linker_plugin:
+       /* No-op. Used by the driver and passed to us because it starts with f.*/
+       break;

SOURCES/gcc8-rh1960701.patch

@@ -0,0 +1,64 @@
+--- gcc/cp/call.c
++++ gcc/cp/call.c
+@@ -6904,7 +6904,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
+ 	elttype = cp_build_qualified_type
+ 	  (elttype, cp_type_quals (elttype) | TYPE_QUAL_CONST);
+ 	array = build_array_of_n_type (elttype, len);
+-	array = finish_compound_literal (array, new_ctor, complain, fcl_c99);
++	array = finish_compound_literal (array, new_ctor, complain);
+ 	/* Take the address explicitly rather than via decay_conversion
+ 	   to avoid the error about taking the address of a temporary.  */
+ 	array = cp_build_addr_expr (array, complain);
+@@ -10984,13 +10984,11 @@ set_up_extended_ref_temp (tree decl, tree expr, vec<tree, va_gc> **cleanups,
+ 	     lvalue-rvalue conversion applied to "a glvalue of literal type
+ 	     that refers to a non-volatile temporary object initialized
+ 	     with a constant expression".  Rather than try to communicate
+-	     that this VAR_DECL is a temporary, just mark it constexpr.
+-
+-	     Currently this is only useful for initializer_list temporaries,
+-	     since reference vars can't appear in constant expressions.  */
++	     that this VAR_DECL is a temporary, just mark it constexpr.  */
+ 	  DECL_DECLARED_CONSTEXPR_P (var) = true;
+ 	  DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (var) = true;
+ 	  TREE_CONSTANT (var) = true;
++	  TREE_READONLY (var) = true;
+ 	}
+       DECL_INITIAL (var) = init;
+       init = NULL_TREE;
+--- gcc/cp/tree.c
++++ gcc/cp/tree.c
+@@ -442,6 +442,14 @@ build_target_expr (tree decl, tree value, tsubst_flags_t complain)
+ 		       || useless_type_conversion_p (TREE_TYPE (decl),
+ 						     TREE_TYPE (value)));
+ 
++  /* Set TREE_READONLY for optimization, such as gimplify_init_constructor
++     moving a constant aggregate into .rodata.  */
++  if (CP_TYPE_CONST_NON_VOLATILE_P (type)
++      && !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type)
++      && !VOID_TYPE_P (TREE_TYPE (value))
++      && reduced_constant_expression_p (value))
++    TREE_READONLY (decl) = true;
++
+   if (complain & tf_no_cleanup)
+     /* The caller is building a new-expr and does not need a cleanup.  */
+     t = NULL_TREE;
+--- /dev/null
++++ gcc/testsuite/g++.dg/cpp1y/pr95226.C
+@@ -0,0 +1,17 @@
++// PR c++/95226
++// { dg-do run { target c++14 } }
++
++#include <vector>
++
++struct T {
++  unsigned a;
++  float b {8.};
++};
++
++int main()
++{
++  T t = {1};
++  std::vector<T> tt = {{1}, {2}};
++  if (t.a != 1 || t.b != 8.0f || tt[0].a != 1 || tt[0].b != 8.0f || tt[1].a != 2 || tt[1].b != 8.0f)
++    __builtin_abort ();
++}

SOURCES/gcc8-rh1981822.patch

@@ -0,0 +1,70 @@
+From 55f40d968b0bd3be4478a9481e829a99ee0fa04f Mon Sep 17 00:00:00 2001
+From: Jason Merrill <jason@redhat.com>
+Date: Mon, 5 Apr 2021 22:50:44 -0400
+Subject: [PATCH] c++: mangling of lambdas in default args [PR91241]
+
+In this testcase, the parms remembered in LAMBDA_EXPR_EXTRA_SCOPE are no
+longer the parms of the FUNCTION_DECL they have as their DECL_CONTEXT, so we
+were mangling both lambdas as parm #0.  But since the parms are numbered
+from right to left we don't need to need to find them in the FUNCTION_DECL,
+we can measure their own DECL_CHAIN.
+
+gcc/cp/ChangeLog:
+
+	PR c++/91241
+	* mangle.c (write_compact_number): Add sanity check.
+	(write_local_name): Use list_length for parm number.
+
+gcc/testsuite/ChangeLog:
+
+	PR c++/91241
+	* g++.dg/abi/lambda-defarg1.C: New test.
+---
+ gcc/cp/mangle.c                           | 11 ++---------
+ gcc/testsuite/g++.dg/abi/lambda-defarg1.C | 11 +++++++++++
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+ create mode 100644 gcc/testsuite/g++.dg/abi/lambda-defarg1.C
+
+--- gcc/cp/mangle.c
++++ gcc/cp/mangle.c
+@@ -1628,6 +1628,7 @@ write_literal_operator_name (tree identifier)
+ static void
+ write_compact_number (int num)
+ {
++  gcc_checking_assert (num >= 0);
+   if (num > 0)
+     write_unsigned_number (num - 1);
+   write_char ('_');
+@@ -2027,15 +2028,7 @@ write_local_name (tree function, const tree local_entity,
+   /* For this purpose, parameters are numbered from right-to-left.  */
+   if (parm)
+     {
+-      tree t;
+-      int i = 0;
+-      for (t = DECL_ARGUMENTS (function); t; t = DECL_CHAIN (t))
+-	{
+-	  if (t == parm)
+-	    i = 1;
+-	  else if (i)
+-	    ++i;
+-	}
++      int i = list_length (parm);
+       write_char ('d');
+       write_compact_number (i - 1);
+     }
+--- /dev/null
++++ gcc/testsuite/g++.dg/abi/lambda-defarg1.C
+@@ -0,0 +1,11 @@
++// PR c++/91241
++// { dg-do compile { target c++11 } }
++
++struct A {
++  int *b(const int & = []() -> int { return 0; }(),
++	 const int & = []() -> int { return 0; }());
++};
++int *A::b(const int &, const int &) { b(); return 0; }
++// { dg-final { scan-assembler "_ZN1A1bERKiS1_" } }
++// { dg-final { scan-assembler "_ZZN1A1bERKiS1_Ed_NKUlvE_clEv" } }
++// { dg-final { scan-assembler "_ZZN1A1bERKiS1_Ed0_NKUlvE_clEv" } }
+-- 
+2.27.0

SOURCES/gcc8-rh2001788.patch

@@ -0,0 +1,456 @@
+commit ee3db7c8f844556d35a66b3732bad9f44a086491
+Author: Jonathan Wakely <jwakely@redhat.com>
+Date:   Mon Sep 27 20:44:24 2021 +0100
+
+    libstdc++: Fix handling of invalid ranges in std::regex [PR102447]
+    
+    std::regex currently allows invalid bracket ranges such as [\w-a] which
+    are only allowed by ECMAScript when in web browser compatibility mode.
+    It should be an error, because the start of the range is a character
+    class, not a single character. The current implementation of
+    _Compiler::_M_expression_term does not provide a way to reject this,
+    because we only remember a previous character, not whether we just
+    processed a character class (or collating symbol etc.)
+    
+    This patch replaces the pair<bool, CharT> used to emulate
+    optional<CharT> with a custom class closer to pair<tribool,CharT>. That
+    allows us to track three states, so that we can tell when we've just
+    seen a character class.
+    
+    With this additional state the code in _M_expression_term for processing
+    the _S_token_bracket_dash can be improved to correctly reject the [\w-a]
+    case, without regressing for valid cases such as [\w-] and [----].
+    
+    libstdc++-v3/ChangeLog:
+    
+            PR libstdc++/102447
+            * include/bits/regex_compiler.h (_Compiler::_BracketState): New
+            class.
+            (_Compiler::_BrackeyMatcher): New alias template.
+            (_Compiler::_M_expression_term): Change pair<bool, CharT>
+            parameter to _BracketState. Process first character for
+            ECMAScript syntax as well as POSIX.
+            * include/bits/regex_compiler.tcc
+            (_Compiler::_M_insert_bracket_matcher): Pass _BracketState.
+            (_Compiler::_M_expression_term): Use _BracketState to store
+            state between calls. Improve handling of dashes in ranges.
+            * testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc:
+            Add more tests for ranges containing dashes. Check invalid
+            ranges with character class at the beginning.
+    
+    (cherry picked from commit 7ce3c230edf6e498e125c805a6dd313bf87dc439)
+
+diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h
+index 7e5c2073554..2eb1c3f7863 100644
+--- a/libstdc++-v3/include/bits/regex_compiler.h
++++ b/libstdc++-v3/include/bits/regex_compiler.h
+@@ -122,13 +122,45 @@ namespace __detail
+ 	void
+ 	_M_insert_bracket_matcher(bool __neg);
+ 
+-      // Returns true if successfully matched one term and should continue.
++      // Cache of the last atom seen in a bracketed range expression.
++      struct _BracketState
++      {
++	enum class _Type : char { _None, _Char, _Class } _M_type = _Type::_None;
++	_CharT _M_char;
++
++	void
++	set(_CharT __c) noexcept { _M_type = _Type::_Char; _M_char = __c; }
++
++	_GLIBCXX_NODISCARD _CharT
++	get() const noexcept { return _M_char; }
++
++	void
++	reset(_Type __t = _Type::_None) noexcept { _M_type = __t; }
++
++	explicit operator bool() const noexcept
++	{ return _M_type != _Type::_None; }
++
++	// Previous token was a single character.
++	_GLIBCXX_NODISCARD bool
++	_M_is_char() const noexcept { return _M_type == _Type::_Char; }
++
++	// Previous token was a character class, equivalent class,
++	// collating symbol etc.
++	_GLIBCXX_NODISCARD bool
++	_M_is_class() const noexcept { return _M_type == _Type::_Class; }
++      };
++
++      template<bool __icase, bool __collate>
++	using _BracketMatcher
++	  = std::__detail::_BracketMatcher<_TraitsT, __icase, __collate>;
++
++      // Returns true if successfully parsed one term and should continue
++      // compiling a bracket expression.
+       // Returns false if the compiler should move on.
+       template<bool __icase, bool __collate>
+ 	bool
+-	_M_expression_term(pair<bool, _CharT>& __last_char,
+-			   _BracketMatcher<_TraitsT, __icase, __collate>&
+-			   __matcher);
++	_M_expression_term(_BracketState& __last_char,
++			   _BracketMatcher<__icase, __collate>& __matcher);
+ 
+       int
+       _M_cur_int_value(int __radix);
+diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc
+index b1169428afb..5877d30ba52 100644
+--- a/libstdc++-v3/include/bits/regex_compiler.tcc
++++ b/libstdc++-v3/include/bits/regex_compiler.tcc
+@@ -140,7 +140,8 @@ namespace __detail
+ 	return true;
+       if (this->_M_atom())
+ 	{
+-	  while (this->_M_quantifier());
++	  while (this->_M_quantifier())
++	    ;
+ 	  return true;
+ 	}
+       return false;
+@@ -410,7 +411,7 @@ namespace __detail
+     _M_insert_character_class_matcher()
+     {
+       __glibcxx_assert(_M_value.size() == 1);
+-      _BracketMatcher<_TraitsT, __icase, __collate> __matcher
++      _BracketMatcher<__icase, __collate> __matcher
+ 	(_M_ctype.is(_CtypeT::upper, _M_value[0]), _M_traits);
+       __matcher._M_add_character_class(_M_value, false);
+       __matcher._M_ready();
+@@ -424,25 +425,17 @@ namespace __detail
+     _Compiler<_TraitsT>::
+     _M_insert_bracket_matcher(bool __neg)
+     {
+-      _BracketMatcher<_TraitsT, __icase, __collate> __matcher(__neg, _M_traits);
+-      pair<bool, _CharT> __last_char; // Optional<_CharT>
+-      __last_char.first = false;
+-      if (!(_M_flags & regex_constants::ECMAScript))
+-	{
+-	  if (_M_try_char())
+-	    {
+-	      __last_char.first = true;
+-	      __last_char.second = _M_value[0];
+-	    }
+-	  else if (_M_match_token(_ScannerT::_S_token_bracket_dash))
+-	    {
+-	      __last_char.first = true;
+-	      __last_char.second = '-';
+-	    }
+-	}
+-      while (_M_expression_term(__last_char, __matcher));
+-      if (__last_char.first)
+-	__matcher._M_add_char(__last_char.second);
++      _BracketMatcher<__icase, __collate> __matcher(__neg, _M_traits);
++      _BracketState __last_char;
++      if (_M_try_char())
++	__last_char.set(_M_value[0]);
++      else if (_M_match_token(_ScannerT::_S_token_bracket_dash))
++	// Dash as first character is a normal character.
++	__last_char.set('-');
++      while (_M_expression_term(__last_char, __matcher))
++	;
++      if (__last_char._M_is_char())
++	__matcher._M_add_char(__last_char.get());
+       __matcher._M_ready();
+       _M_stack.push(_StateSeqT(
+ 		      *_M_nfa,
+@@ -453,27 +446,27 @@ namespace __detail
+   template<bool __icase, bool __collate>
+     bool
+     _Compiler<_TraitsT>::
+-    _M_expression_term(pair<bool, _CharT>& __last_char,
+-		       _BracketMatcher<_TraitsT, __icase, __collate>& __matcher)
++    _M_expression_term(_BracketState& __last_char,
++		       _BracketMatcher<__icase, __collate>& __matcher)
+     {
+       if (_M_match_token(_ScannerT::_S_token_bracket_end))
+ 	return false;
+ 
++      // Add any previously cached char into the matcher and update cache.
+       const auto __push_char = [&](_CharT __ch)
+       {
+-	if (__last_char.first)
+-	  __matcher._M_add_char(__last_char.second);
+-	else
+-	  __last_char.first = true;
+-	__last_char.second = __ch;
++	if (__last_char._M_is_char())
++	  __matcher._M_add_char(__last_char.get());
++	__last_char.set(__ch);
+       };
+-      const auto __flush = [&]
++      // Add any previously cached char into the matcher and update cache.
++      const auto __push_class = [&]
+       {
+-	if (__last_char.first)
+-	  {
+-	    __matcher._M_add_char(__last_char.second);
+-	    __last_char.first = false;
+-	  }
++        if (__last_char._M_is_char())
++	  __matcher._M_add_char(__last_char.get());
++	// We don't cache anything here, just record that the last thing
++	// processed was a character class (or similar).
++	__last_char.reset(_BracketState::_Type::_Class);
+       };
+ 
+       if (_M_match_token(_ScannerT::_S_token_collsymbol))
+@@ -482,16 +475,16 @@ namespace __detail
+ 	  if (__symbol.size() == 1)
+ 	    __push_char(__symbol[0]);
+ 	  else
+-	    __flush();
++	    __push_class();
+ 	}
+       else if (_M_match_token(_ScannerT::_S_token_equiv_class_name))
+ 	{
+-	  __flush();
++	  __push_class();
+ 	  __matcher._M_add_equivalence_class(_M_value);
+ 	}
+       else if (_M_match_token(_ScannerT::_S_token_char_class_name))
+ 	{
+-	  __flush();
++	  __push_class();
+ 	  __matcher._M_add_character_class(_M_value, false);
+ 	}
+       else if (_M_try_char())
+@@ -508,49 +501,50 @@ namespace __detail
+       // It turns out that no one reads BNFs ;)
+       else if (_M_match_token(_ScannerT::_S_token_bracket_dash))
+ 	{
+-	  if (!__last_char.first)
++	  if (_M_match_token(_ScannerT::_S_token_bracket_end))
+ 	    {
+-	      if (!(_M_flags & regex_constants::ECMAScript))
+-		{
+-		  if (_M_match_token(_ScannerT::_S_token_bracket_end))
+-		    {
+-		      __push_char('-');
+-		      return false;
+-		    }
+-		  __throw_regex_error(
+-		    regex_constants::error_range,
+-		    "Unexpected dash in bracket expression. For POSIX syntax, "
+-		    "a dash is not treated literally only when it is at "
+-		    "beginning or end.");
+-		}
++	      // For "-]" the dash is a literal character.
+ 	      __push_char('-');
++	      return false;
+ 	    }
+-	  else
++	  else if (__last_char._M_is_class())
++	    {
++	      // "\\w-" is invalid, start of range must be a single char.
++	      __throw_regex_error(regex_constants::error_range,
++		    "Invalid start of range in bracket expression.");
++	    }
++	  else if (__last_char._M_is_char())
+ 	    {
+ 	      if (_M_try_char())
+ 		{
+-		  __matcher._M_make_range(__last_char.second, _M_value[0]);
+-		  __last_char.first = false;
++		  // "x-y"
++		  __matcher._M_make_range(__last_char.get(), _M_value[0]);
++		  __last_char.reset();
+ 		}
+ 	      else if (_M_match_token(_ScannerT::_S_token_bracket_dash))
+ 		{
+-		  __matcher._M_make_range(__last_char.second, '-');
+-		  __last_char.first = false;
++		  // "x--"
++		  __matcher._M_make_range(__last_char.get(), '-');
++		  __last_char.reset();
+ 		}
+ 	      else
+-		{
+-		  if (_M_scanner._M_get_token()
+-		      != _ScannerT::_S_token_bracket_end)
+-		    __throw_regex_error(
+-		      regex_constants::error_range,
+-		      "Character is expected after a dash.");
+-		  __push_char('-');
+-		}
++		__throw_regex_error(regex_constants::error_range,
++		      "Invalid end of range in bracket expression.");
+ 	    }
++	  else if (_M_flags & regex_constants::ECMAScript)
++	    {
++	      // A dash that is not part of an existing range. Might be the
++	      // start of a new range, or might just be a literal '-' char.
++	      // Only ECMAScript allows that in the middle of a bracket expr.
++	      __push_char('-');
++	    }
++	  else
++	    __throw_regex_error(regex_constants::error_range,
++				"Invalid dash in bracket expression.");
+ 	}
+       else if (_M_match_token(_ScannerT::_S_token_quoted_class))
+ 	{
+-	  __flush();
++	  __push_class();
+ 	  __matcher._M_add_character_class(_M_value,
+ 					   _M_ctype.is(_CtypeT::upper,
+ 						       _M_value[0]));
+diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc
+index 236ab663fc0..57088f5af83 100644
+--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc
++++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc
+@@ -68,6 +68,16 @@ test01()
+ void
+ test02()
+ {
++  VERIFY(regex_match("-", regex("[-]", regex_constants::ECMAScript)));
++  VERIFY(regex_match("-", regex("[--]", regex_constants::ECMAScript)));
++  VERIFY(regex_match("-", regex("[---]", regex_constants::ECMAScript)));
++  VERIFY(regex_match("-", regex("[----]", regex_constants::ECMAScript)));
++  VERIFY(regex_match("-", regex("[-----]", regex_constants::ECMAScript)));
++
++  VERIFY(regex_match("-", regex("[-]", regex_constants::extended)));
++  VERIFY(regex_match("-", regex("[--]", regex_constants::extended)));
++  VERIFY(regex_match("-", regex("[---]", regex_constants::extended)));
++  VERIFY(regex_match("-", regex("[----]", regex_constants::extended)));
+   try
+   {
+     std::regex re("[-----]", std::regex::extended);
+@@ -77,7 +87,6 @@ test02()
+   {
+     VERIFY(e.code() == std::regex_constants::error_range);
+   }
+-  std::regex re("[-----]", std::regex::ECMAScript);
+ 
+   VERIFY(!regex_match("b", regex("[-ac]", regex_constants::extended)));
+   VERIFY(!regex_match("b", regex("[ac-]", regex_constants::extended)));
+@@ -92,7 +101,27 @@ test02()
+   }
+   catch (const std::regex_error& e)
+   {
++    VERIFY(e.code() == std::regex_constants::error_range);
++  }
++  try
++  {
++    regex("[@--]", regex_constants::extended);
++    VERIFY(false);
+   }
++  catch (const std::regex_error& e)
++  {
++    VERIFY(e.code() == std::regex_constants::error_range);
++  }
++  try
++  {
++    regex("[--%]", regex_constants::extended);
++    VERIFY(false);
++  }
++  catch (const std::regex_error& e)
++  {
++    VERIFY(e.code() == std::regex_constants::error_range);
++  }
++
+   VERIFY(regex_match("].", regex("[][.hyphen.]-0]*", regex_constants::extended)));
+ }
+ 
+@@ -157,6 +186,36 @@ test06()
+   VERIFY(regex_match("a-", debian_cron_namespace_ok));
+ }
+ 
++// libstdc++/102447
++void
++test07()
++{
++  VERIFY(regex_match("-", std::regex("[\\w-]", std::regex::ECMAScript)));
++  VERIFY(regex_match("a", std::regex("[\\w-]", std::regex::ECMAScript)));
++  VERIFY(regex_match("-", std::regex("[a-]", std::regex::ECMAScript)));
++  VERIFY(regex_match("a", std::regex("[a-]", std::regex::ECMAScript)));
++
++  try
++  {
++    std::regex re("[\\w-a]", std::regex::ECMAScript);
++    VERIFY(false);
++  }
++  catch (const std::regex_error& e)
++  {
++    VERIFY(e.code() == std::regex_constants::error_range);
++  }
++
++  try
++  {
++    std::regex re("[\\w--]", std::regex::ECMAScript);
++    VERIFY(false);
++  }
++  catch (const std::regex_error& e)
++  {
++    VERIFY(e.code() == std::regex_constants::error_range);
++  }
++}
++
+ int
+ main()
+ {
+@@ -166,6 +225,7 @@ main()
+   test04();
+   test05();
+   test06();
++  test07();
+ 
+   return 0;
+ }
+
+commit 1851cc4c5f2666dfdec53a2ada57095ffc59e08b
+Author: Jonathan Wakely <jwakely@redhat.com>
+Date:   Mon Dec 13 13:36:33 2021 +0000
+
+    libstdc++: Fix non-reserved name in <regex> header
+    
+    libstdc++-v3/ChangeLog:
+    
+            * include/bits/regex_compiler.tcc (_Compiler::_M_match_token):
+            Use reserved name for parameter.
+            * testsuite/17_intro/names.cc: Check "token".
+    
+    (cherry picked from commit b0e6a257f1862e217cdf19332ea0f7bad56dcddc)
+
+diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc
+index 8af920e5fe9..b1169428afb 100644
+--- a/libstdc++-v3/include/bits/regex_compiler.tcc
++++ b/libstdc++-v3/include/bits/regex_compiler.tcc
+@@ -586,9 +586,9 @@ namespace __detail
+   template<typename _TraitsT>
+     bool
+     _Compiler<_TraitsT>::
+-    _M_match_token(_TokenT token)
++    _M_match_token(_TokenT __token)
+     {
+-      if (token == _M_scanner._M_get_token())
++      if (__token == _M_scanner._M_get_token())
+ 	{
+ 	  _M_value = _M_scanner._M_get_value();
+ 	  _M_scanner._M_advance();
+diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
+index d758138dfb1..6c06aba7228 100644
+--- a/libstdc++-v3/testsuite/17_intro/names.cc
++++ b/libstdc++-v3/testsuite/17_intro/names.cc
+@@ -99,6 +99,7 @@
+ #define z (
+ 
+ #define tmp (
++#define token (
+ 
+ #if __cplusplus < 201103L
+ #define uses_allocator  (
+--- a/libstdc++-v3/include/bits/c++config.orig	2022-07-08 15:06:14.083231445 -0400
++++ b/libstdc++-v3/include/bits/c++config	2022-07-08 15:06:41.733247859 -0400
+@@ -99,6 +99,12 @@
+ # define _GLIBCXX_ABI_TAG_CXX11 __attribute ((__abi_tag__ ("cxx11")))
+ #endif
+ 
++// Macro to warn about unused results.
++#if __cplusplus >= 201703L
++# define _GLIBCXX_NODISCARD [[__nodiscard__]]
++#else
++# define _GLIBCXX_NODISCARD
++#endif
+ 
+ #if __cplusplus
+ 

SOURCES/gcc8-rh2028609.patch

@@ -0,0 +1,101 @@
+The cprop_hardreg pass is built around the assumption that accessing a
+register in a narrower mode is the same as accessing the lowpart of
+the register.  This unfortunately is not true for vector registers on
+IBM Z. This caused a miscompile of LLVM with GCC 8.5. The problem
+could not be reproduced with upstream GCC unfortunately but we have to
+assume that it is latent there. The right fix would require
+substantial changes to the cprop pass and is certainly something we
+would want for our platform. But since this would not be acceptable
+for older GCCs I'll go with what Vladimir proposed in the RedHat BZ
+and introduce a hopefully temporary and undocumented target hook to
+disable that specific transformation in regcprop.c.
+
+--- a/gcc/config/s390/s390.c
++++ b/gcc/config/s390/s390.c
+@@ -10488,6 +10488,18 @@ s390_hard_regno_mode_ok (unsigned int regno, machine_mode mode)
+   return false;
+ }
+ 
++/* Implement TARGET_NARROW_MODE_REFERS_LOW_PART_P.  */
++
++static bool
++s390_narrow_mode_refers_low_part_p (unsigned int regno)
++{
++  if (reg_classes_intersect_p (VEC_REGS, REGNO_REG_CLASS (regno)))
++    return false;
++
++  return true;
++}
++
++
+ /* Implement TARGET_MODES_TIEABLE_P.  */
+ 
+ static bool
+@@ -16956,6 +16968,9 @@ s390_case_values_threshold (void)
+ #undef TARGET_CASE_VALUES_THRESHOLD
+ #define TARGET_CASE_VALUES_THRESHOLD s390_case_values_threshold
+ 
++#undef TARGET_NARROW_MODE_REFERS_LOW_PART_P
++#define TARGET_NARROW_MODE_REFERS_LOW_PART_P s390_narrow_mode_refers_low_part_p
++
+ struct gcc_target targetm = TARGET_INITIALIZER;
+ 
+ #include "gt-s390.h"
+--- a/gcc/regcprop.c
++++ b/gcc/regcprop.c
+@@ -426,7 +426,8 @@ maybe_mode_change (machine_mode orig_mode, machine_mode copy_mode,
+ 
+   if (orig_mode == new_mode)
+     return gen_raw_REG (new_mode, regno);
+-  else if (mode_change_ok (orig_mode, new_mode, regno))
++  else if (mode_change_ok (orig_mode, new_mode, regno)
++	   && targetm.narrow_mode_refers_low_part_p (copy_regno))
+     {
+       int copy_nregs = hard_regno_nregs (copy_regno, copy_mode);
+       int use_nregs = hard_regno_nregs (copy_regno, new_mode);
+--- a/gcc/target.def
++++ b/gcc/target.def
+@@ -5446,6 +5446,16 @@ value that the middle-end intended.",
+  bool, (machine_mode from, machine_mode to, reg_class_t rclass),
+  hook_bool_mode_mode_reg_class_t_true)
+ 
++/* This hook is used to work around a problem in regcprop. Hardcoded
++assumptions currently prevent it from working correctly for targets
++where the low part of a multi-word register doesn't align to accessing
++the register with a narrower mode.  */
++DEFHOOK_UNDOC
++(narrow_mode_refers_low_part_p,
++"",
++bool, (unsigned int regno),
++hook_bool_uint_true)
++
+ /* Change pseudo allocno class calculated by IRA.  */
+ DEFHOOK
+ (ira_change_pseudo_allocno_class,
+--- a/gcc/hooks.h
++++ b/gcc/hooks.h
+@@ -86,6 +86,7 @@ extern void hook_void_tree (tree);
+ extern void hook_void_tree_treeptr (tree, tree *);
+ extern void hook_void_int_int (int, int);
+ extern void hook_void_gcc_optionsp (struct gcc_options *);
++extern bool hook_bool_uint_true (unsigned int);
+ extern bool hook_bool_uint_uintp_false (unsigned int, unsigned int *);
+ 
+ extern int hook_int_uint_mode_1 (unsigned int, machine_mode);
+--- a/gcc/hooks.c
++++ b/gcc/hooks.c
+@@ -498,6 +498,14 @@ hook_void_gcc_optionsp (struct gcc_optio
+ {
+ }
+ 
++/* Generic hook that takes an unsigned int and returns true.  */
++
++bool
++hook_bool_uint_true (unsigned int)
++{
++  return true;
++}
++
+ /* Generic hook that takes an unsigned int, an unsigned int pointer and
+    returns false.  */
+ 

SOURCES/gcc8-rh2117838.patch

@@ -0,0 +1,103 @@
+diff --git a/gcc/testsuite/g++.dg/torture/phi-1.C b/gcc/testsuite/g++.dg/torture/phi-1.C
+new file mode 100644
+index 00000000000..69fb3d7ba38
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/torture/phi-1.C
+@@ -0,0 +1,28 @@
++// { dg-do compile { target c++11 } }
++// { dg-options "--param early-inlining-insns=14" }
++
++struct Element;
++template <int _Nm> struct __array_traits { typedef Element _Type[_Nm]; };
++template <int _Nm> struct array {
++  typename __array_traits<_Nm>::_Type _M_elems;
++};
++bool logLevel();
++struct LogCapture {
++  void stream();
++};
++struct Element {
++  Element();
++  long data_;
++};
++using ElementArray = array<6>;
++struct ElementManager {
++  ElementManager();
++  ElementArray array_;
++};
++static ElementArray makeArray() {
++  if (logLevel())
++    LogCapture().stream();
++  ElementArray foo;
++  return foo;
++}
++ElementManager::ElementManager() : array_(makeArray()) {}
+diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
+index 84e58e66628..78c0c6a4189 100644
+--- a/gcc/tree-cfg.c
++++ b/gcc/tree-cfg.c
+@@ -2944,35 +2944,6 @@ last_and_only_stmt (basic_block bb)
+     return NULL;
+ }
+ 
+-/* Reinstall those PHI arguments queued in OLD_EDGE to NEW_EDGE.  */
+-
+-static void
+-reinstall_phi_args (edge new_edge, edge old_edge)
+-{
+-  edge_var_map *vm;
+-  int i;
+-  gphi_iterator phis;
+-
+-  vec<edge_var_map> *v = redirect_edge_var_map_vector (old_edge);
+-  if (!v)
+-    return;
+-
+-  for (i = 0, phis = gsi_start_phis (new_edge->dest);
+-       v->iterate (i, &vm) && !gsi_end_p (phis);
+-       i++, gsi_next (&phis))
+-    {
+-      gphi *phi = phis.phi ();
+-      tree result = redirect_edge_var_map_result (vm);
+-      tree arg = redirect_edge_var_map_def (vm);
+-
+-      gcc_assert (result == gimple_phi_result (phi));
+-
+-      add_phi_arg (phi, arg, new_edge, redirect_edge_var_map_location (vm));
+-    }
+-
+-  redirect_edge_var_map_clear (old_edge);
+-}
+-
+ /* Returns the basic block after which the new basic block created
+    by splitting edge EDGE_IN should be placed.  Tries to keep the new block
+    near its "logical" location.  This is of most help to humans looking
+@@ -3012,11 +2983,24 @@ gimple_split_edge (edge edge_in)
+   new_bb = create_empty_bb (after_bb);
+   new_bb->count = edge_in->count ();
+ 
+-  e = redirect_edge_and_branch (edge_in, new_bb);
+-  gcc_assert (e == edge_in);
+-
++  /* We want to avoid re-allocating PHIs when we first
++     add the fallthru edge from new_bb to dest but we also
++     want to avoid changing PHI argument order when
++     first redirecting edge_in away from dest.  The former
++     avoids changing PHI argument order by adding them
++     last and then the redirection swapping it back into
++     place by means of unordered remove.
++     So hack around things by temporarily removing all PHIs
++     from the destination during the edge redirection and then
++     making sure the edges stay in order.  */
++  gimple_seq saved_phis = phi_nodes (dest);
++  unsigned old_dest_idx = edge_in->dest_idx;
++  set_phi_nodes (dest, NULL);
+   new_edge = make_single_succ_edge (new_bb, dest, EDGE_FALLTHRU);
+-  reinstall_phi_args (new_edge, e);
++  e = redirect_edge_and_branch (edge_in, new_bb);
++  gcc_assert (e == edge_in && new_edge->dest_idx == old_dest_idx);
++  /* set_phi_nodes sets the BB of the PHI nodes, so do it manually here.  */
++  dest->il.gimple.phi_nodes = saved_phis;
+ 
+   return new_bb;
+ }

SOURCES/gcc8-rh2137448.patch

@@ -0,0 +1,110 @@
+commit 8b89515caca5149329c0cd20485e69e2d0f879d4
+Author: Marek Polacek <polacek@redhat.com>
+Date:   Wed Dec 7 13:44:38 2022 -0500
+
+    strlen: Use D_S_U in maybe_set_strlen_range
+    
+    This patch fixes #2137448 where the customer uses strlen on a buffer
+    that was filled by converting the buffer to a struct and copying a string
+    into a flexible array member of the struct.
+    
+    This regressed with r262438 in the sense that the strlen was folded to 0.
+    The strlen=0 result started with
+    https://gcc.gnu.org/pipermail/gcc-patches/2018-July/501912.html
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=715fcd73b66c639d9e0e3f3ef9c6ff9d621d7131
+    which seems like an undesirable change.  It was fixed (back to strlen=3) by
+    https://gcc.gnu.org/legacy-ml/gcc-patches/2019-01/msg00069.html
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=d4bf69750d31d08068f8242225b8fa06cdf11411
+    but the changes are not backportable.
+    
+    Instead, this patch makes maybe_set_strlen_range use DECL_SIZE_UNIT
+    rather than TYPE_SIZE_UNIT, fixing the regression.
+    
+    I could never reproduce the problem in C, only C++.  C/C++ represent array
+    type domains differently: C has
+    
+      char[0:]
+    
+    but C++
+    
+      char[0:18446744073709551615]
+    
+    I'm not sure if that explains it.  In any case, I put the new test into
+    c-c++-common/.
+    
+    Also, the original test had
+    
+      printf("strlen = %zu\n", strlen(q->name));
+    
+    so naturally, for the testsuite, I wanted to convert that into
+    
+      if (strlen(q->name) != ...)
+         __builtin_abort ();
+    
+    but then I could no longer reproduce the problem.  After some poking
+    I realized I want -fno-early-inlining.
+    
+    Co-authored-by: Jakub Jelinek <jakub@redhat.com>
+
+diff --git a/gcc/testsuite/c-c++-common/torture/strlenopt-1.c b/gcc/testsuite/c-c++-common/torture/strlenopt-1.c
+new file mode 100644
+index 00000000000..e8c11044119
+--- /dev/null
++++ b/gcc/testsuite/c-c++-common/torture/strlenopt-1.c
+@@ -0,0 +1,38 @@
++/* { dg-do run } */
++/* { dg-options "-fno-early-inlining" } */
++
++#define FORTIFY_SOURCE 2
++
++struct S {
++ char skip;
++ char name[0];
++};
++
++static char static_buf[4];
++
++static void
++print_name_len(void *p)
++{
++  struct S *q = (struct S *) p;
++  if (__builtin_strlen(q->name) != 2)
++    __builtin_abort ();
++}
++
++int
++main(void)
++{
++  // treat static storage as struct
++  struct S *c = (struct S *)static_buf;
++  __builtin_strcpy(c->name, "aa");
++
++  // copy static storage to stack storage
++  char stack_buf[4] = { 0 };
++  __builtin_memcpy(stack_buf, static_buf, 4);
++
++  // static and stack both now contain ( 0, 'a', 'a', 0 }
++
++  // indirectly pass the stack storage to the length function
++  char *s = (char *)stack_buf;
++  print_name_len(s);
++  return 0;
++}
+diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
+index 55e82e7b638..da47046cc2a 100644
+--- a/gcc/tree-ssa-strlen.c
++++ b/gcc/tree-ssa-strlen.c
+@@ -1200,8 +1200,11 @@ maybe_set_strlen_range (tree lhs, tree src)
+       || array_at_struct_end_p (src))
+     return;
+ 
+-  tree type = TREE_TYPE (src);
+-  if (tree size = TYPE_SIZE_UNIT (type))
++  src = get_base_address (src);
++  if (!DECL_P (src))
++    return;
++
++  if (tree size = DECL_SIZE_UNIT (src))
+     if (size && TREE_CODE (size) == INTEGER_CST)
+       {
+ 	wide_int max = wi::to_wide (size);

SOURCES/gcc8-rh2213753.patch

@@ -0,0 +1,75 @@
+From 6f989c5c6e5f909996a117bb24ecac936e7526c1 Mon Sep 17 00:00:00 2001
+From: Marek Polacek <polacek@redhat.com>
+Date: Wed, 14 Jun 2023 17:09:15 -0400
+Subject: [PATCH] final: fix for TLSLD references [BZ#2213753]
+
+Patch by Jakub Jelinek.
+---
+ gcc/final.c                          | 17 +++++++++++++++++
+ gcc/testsuite/g++.dg/tls/bz2213753.C | 26 ++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+)
+ create mode 100644 gcc/testsuite/g++.dg/tls/bz2213753.C
+
+diff --git a/gcc/final.c b/gcc/final.c
+index 5a65a8ce07c..c783fbb83d7 100644
+--- a/gcc/final.c
++++ b/gcc/final.c
+@@ -1691,6 +1691,23 @@ get_some_local_dynamic_name ()
+ 	    }
+ 	}
+ 
++  /* If all the TLSLD references from current function were DCEd, try harder and pick
++     name of any TLSLD symbol in current TU.  */
++  varpool_node *node;
++  if (!this_is_asm_operands)
++    FOR_EACH_VARIABLE (node)
++      if (DECL_THREAD_LOCAL_P (node->decl)
++	  && TREE_STATIC (node->decl)
++	  && decl_tls_model (node->decl) == TLS_MODEL_LOCAL_DYNAMIC
++	  && DECL_RTL_SET_P (node->decl))
++	{
++	  rtx rtl = DECL_RTL (node->decl);
++	  if (MEM_P (rtl)
++	      && GET_CODE (XEXP (rtl, 0)) == SYMBOL_REF
++	      && SYMBOL_REF_TLS_MODEL (XEXP (rtl, 0)) == TLS_MODEL_LOCAL_DYNAMIC)
++	    return XSTR (XEXP (rtl, 0), 0);
++	}
++
+   return 0;
+ }
+ 
+diff --git a/gcc/testsuite/g++.dg/tls/bz2213753.C b/gcc/testsuite/g++.dg/tls/bz2213753.C
+new file mode 100644
+index 00000000000..0c4742d8058
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/tls/bz2213753.C
+@@ -0,0 +1,26 @@
++// RHBZ #2213753
++// { dg-do compile { target c++11 } }
++// { dg-require-effective-target fpic }
++// { dg-require-effective-target shared }
++// { dg-require-effective-target tls }
++// { dg-options "-fPIC -O2" }
++// { dg-add-options tls }
++
++struct A { ~A (); };
++static thread_local int *t;
++int a;
++A::~A () { t = &a; }
++long b;
++
++void *
++foo ()
++{
++  void *c;
++  if (t)
++    {
++      c = operator new (b);
++      return c;
++    }
++  void *d = operator new (b);
++  return d;
++}
+-- 
+2.40.1
+

SOURCES/gcc8-s390x-regarg-2.patch

@@ -1,6 +1,6 @@
-commit 36ffb2e0293d1bbef30e3553a431679de00549b9
+commit 1467907e405bc18fb6935b5d432cfa5f936e838d
 Author: Andreas Krebbel <krebbel@linux.ibm.com>
-Date:   Wed Feb 1 08:59:42 2023 +0100
+Date:   Thu Mar 30 13:57:54 2023 +0200
 
     IBM zSystems: Make stack_tie to work with hard frame pointer
     
@@ -24,11 +24,13 @@ Date:   Wed Feb 1 08:59:42 2023 +0100
             (s390_emit_prologue): Emit stack_tie when frame-pointer is needed.
             * config/s390/s390.md (stack_tie): Add a register operand and
             rename to ...
-            (@stack_tie<mode>): ... this.
+            (stack_tiesi, stack_tiedi): ... this.
 
+diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
+index 20424537558..952c708be7a 100644
 --- a/gcc/config/s390/s390.c
 +++ b/gcc/config/s390/s390.c
-@@ -10898,9 +10898,7 @@ save_gprs (rtx base, int offset, int first, int last)
+@@ -10921,9 +10921,7 @@ save_gprs (rtx base, int offset, int first, int last)
    int i;
  
    addr = plus_constant (Pmode, base, offset);
@@ -39,7 +41,7 @@ Date:   Wed Feb 1 08:59:42 2023 +0100
  
    /* Special-case single register.  */
    if (first == last)
-@@ -11012,8 +11010,7 @@ restore_gprs (rtx base, int offset, int first, int last)
+@@ -11035,8 +11033,7 @@ restore_gprs (rtx base, int offset, int first, int last)
    rtx addr, insn;
  
    addr = plus_constant (Pmode, base, offset);
@@ -49,7 +51,7 @@ Date:   Wed Feb 1 08:59:42 2023 +0100
  
    /* Special-case single register.  */
    if (first == last)
-@@ -11062,10 +11059,11 @@ s390_load_got (void)
+@@ -11105,10 +11102,14 @@ s390_load_got (void)
  static void
  s390_emit_stack_tie (void)
  {
@@ -58,14 +60,17 @@ Date:   Wed Feb 1 08:59:42 2023 +0100
 -
 -  emit_insn (gen_stack_tie (mem));
 +  rtx mem = gen_frame_mem (BLKmode, stack_pointer_rtx);
-+  if (frame_pointer_needed)
++  rtx stack_reg = (frame_pointer_needed
-+    emit_insn (gen_stack_tie (Pmode, mem, hard_frame_pointer_rtx));
++		   ? hard_frame_pointer_rtx
++		   : stack_pointer_rtx);
++  if (TARGET_64BIT)
++    emit_insn (gen_stack_tiedi (mem, stack_reg));
 +  else
-+    emit_insn (gen_stack_tie (Pmode, mem, stack_pointer_rtx));
++    emit_insn (gen_stack_tiesi (mem, stack_reg));
  }
  
  /* Copy GPRS into FPR save slots.  */
-@@ -11676,6 +11674,7 @@ s390_emit_prologue (void)
+@@ -11701,6 +11702,7 @@ s390_emit_prologue (void)
  
    if (frame_pointer_needed)
      {
@@ -74,19 +79,28 @@ Date:   Wed Feb 1 08:59:42 2023 +0100
        RTX_FRAME_RELATED_P (insn) = 1;
      }
 diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
-index 4828aa08be6..00d39608e1d 100644
+index 7114609b676..f235df3a25d 100644
 --- a/gcc/config/s390/s390.md
 +++ b/gcc/config/s390/s390.md
-@@ -11590,9 +11590,10 @@ (define_insn "stack_protect_test<mode>"
+@@ -11366,10 +11366,19 @@
  ; This is used in s390_emit_prologue in order to prevent insns
  ; adjusting the stack pointer to be moved over insns writing stack
  ; slots using a copy of the stack pointer in a different register.
 -(define_insn "stack_tie"
-+(define_insn "@stack_tie<mode>"
++(define_insn "stack_tiesi"
    [(set (match_operand:BLK 0 "memory_operand" "+m")
 -        (unspec:BLK [(match_dup 0)] UNSPEC_TIE))]
 +        (unspec:BLK [(match_dup 0)
-+		     (match_operand:P 1 "register_operand" "r")] UNSPEC_TIE))]
++		     (match_operand:SI 1 "register_operand" "r")] UNSPEC_TIE))]
++  "!TARGET_64BIT"
    ""
++  [(set_attr "length" "0")])
++
++(define_insn "stack_tiedi"
++  [(set (match_operand:BLK 0 "memory_operand" "+m")
++        (unspec:BLK [(match_dup 0)
++		     (match_operand:DI 1 "register_operand" "r")] UNSPEC_TIE))]
++  "TARGET_64BIT"
    ""
    [(set_attr "length" "0")])
+ 

SOURCES/gcc8-s390x-regarg-3.patch

@@ -411,10 +411,10 @@ Date:   Wed Feb 1 08:59:42 2023 +0100
 -
 -	  /* If f4 and f6 are call clobbered they are saved due to
 -	     stdargs and therefore are not frame related.  */
--	  if (!call_used_regs[i])
+-	  if (!call_really_used_regs[i])
 -	    RTX_FRAME_RELATED_P (insn) = 1;
  	}
-       else if (!TARGET_PACKED_STACK || call_used_regs[i])
+       else if (!TARGET_PACKED_STACK || call_really_used_regs[i])
  	offset += 8;
 @@ -11491,11 +11603,10 @@ s390_emit_prologue (void)
        for (i = FPR15_REGNUM; i >= FPR8_REGNUM && offset >= 0; i--)
@@ -463,9 +463,9 @@ index 57d1b95bd65..344aa551f44 100644
 --- a/gcc/config/s390/s390.opt
 +++ b/gcc/config/s390/s390.opt
 @@ -321,3 +321,7 @@ and the default behavior is to emit separate multiplication and addition
- instructions for long doubles in vector registers, because measurements show
+ -mindirect-branch* or -mfunction-return* options.  The sections
- that this improves performance.  This option allows overriding it for testing
+ consist of an array of 32 bit elements. Each entry holds the offset
- purposes.
+ from the entry to the patched location.
 +
 +mpreserve-args
 +Target Var(s390_preserve_args_p) Init(0)

SOURCES/nvptx-tools-build.patch

@@ -0,0 +1,11 @@
+--- nvptx-tools/nvptx-as.c.jj	2017-01-20 12:40:18.000000000 +0100
++++ nvptx-tools/nvptx-as.c	2017-01-20 12:43:53.864271442 +0100
+@@ -939,7 +939,7 @@ fork_execute (const char *prog, char *co
+ 	  fatal_error ("%s: %m", errmsg);
+ 	}
+       else
+-	fatal_error (errmsg);
++	fatal_error ("%s", errmsg);
+     }
+   do_wait (prog, pex);
+ }

SOURCES/nvptx-tools-glibc.patch

@@ -0,0 +1,32 @@
+--- nvptx-tools/configure.ac.jj	2017-01-13 12:48:31.000000000 +0100
++++ nvptx-tools/configure.ac	2017-05-03 10:26:57.076092259 +0200
+@@ -66,6 +66,8 @@ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ 
++AC_CHECK_DECLS(getopt)
++
+ AC_CONFIG_SUBDIRS([libiberty])
+ AC_CONFIG_FILES([Makefile dejagnu.exp])
+ AC_OUTPUT
+--- nvptx-tools/configure.jj	2017-01-13 12:48:54.000000000 +0100
++++ nvptx-tools/configure	2017-05-03 10:27:13.503876809 +0200
+@@ -3963,6 +3963,18 @@ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ 
++ac_fn_c_check_decl "$LINENO" "getopt" "ac_cv_have_decl_getopt" "$ac_includes_default"
++if test "x$ac_cv_have_decl_getopt" = x""yes; then :
++  ac_have_decl=1
++else
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_GETOPT $ac_have_decl
++_ACEOF
++
++
+ 
+ 
+ subdirs="$subdirs libiberty"

SOURCES/nvptx-tools-no-ptxas.patch

@@ -0,0 +1,947 @@
+--- nvptx-tools/configure.ac
++++ nvptx-tools/configure.ac
+@@ -51,6 +51,7 @@ LIBS="$LIBS -lcuda"
+ AC_CHECK_FUNCS([[cuGetErrorName] [cuGetErrorString]])
+ AC_CHECK_DECLS([[cuGetErrorName], [cuGetErrorString]],
+   [], [], [[#include <cuda.h>]])
++AC_CHECK_HEADERS(unistd.h sys/stat.h)
+ 
+ AC_MSG_CHECKING([for extra programs to build requiring -lcuda])
+ NVPTX_RUN=
+--- nvptx-tools/include/libiberty.h
++++ nvptx-tools/include/libiberty.h
+@@ -390,6 +390,17 @@ extern void hex_init (void);
+ /* Save files used for communication between processes.  */
+ #define PEX_SAVE_TEMPS		0x4
+ 
++/* Max number of alloca bytes per call before we must switch to malloc.
++
++   ?? Swiped from gnulib's regex_internal.h header.  Is this actually
++   the case?  This number seems arbitrary, though sane.
++
++   The OS usually guarantees only one guard page at the bottom of the stack,
++   and a page size can be as small as 4096 bytes.  So we cannot safely
++   allocate anything larger than 4096 bytes.  Also care for the possibility
++   of a few compiler-allocated temporary stack slots.  */
++#define MAX_ALLOCA_SIZE	4032
++
+ /* Prepare to execute one or more programs, with standard output of
+    each program fed to standard input of the next.
+    FLAGS	As above.
+--- nvptx-tools/nvptx-as.c
++++ nvptx-tools/nvptx-as.c
+@@ -30,6 +30,9 @@
+ #include <string.h>
+ #include <wait.h>
+ #include <unistd.h>
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+ #include <errno.h>
+ #define obstack_chunk_alloc malloc
+ #define obstack_chunk_free free
+@@ -42,6 +45,38 @@
+ 
+ #include "version.h"
+ 
++#ifndef R_OK
++#define R_OK 4
++#define W_OK 2
++#define X_OK 1
++#endif
++
++#ifndef DIR_SEPARATOR
++#  define DIR_SEPARATOR '/'
++#endif
++
++#if defined (_WIN32) || defined (__MSDOS__) \
++    || defined (__DJGPP__) || defined (__OS2__)
++#  define HAVE_DOS_BASED_FILE_SYSTEM
++#  define HAVE_HOST_EXECUTABLE_SUFFIX
++#  define HOST_EXECUTABLE_SUFFIX ".exe"
++#  ifndef DIR_SEPARATOR_2 
++#    define DIR_SEPARATOR_2 '\\'
++#  endif
++#  define PATH_SEPARATOR ';'
++#else
++#  define PATH_SEPARATOR ':'
++#endif
++
++#ifndef DIR_SEPARATOR_2
++#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
++#else
++#  define IS_DIR_SEPARATOR(ch) \
++	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
++#endif
++
++#define DIR_UP ".."
++
+ static const char *outname = NULL;
+ 
+ static void __attribute__ ((format (printf, 1, 2)))
+@@ -816,7 +851,7 @@ traverse (void **slot, void *data)
+ }
+ 
+ static void
+-process (FILE *in, FILE *out)
++process (FILE *in, FILE *out, int verify, const char *outname)
+ {
+   symbol_table = htab_create (500, hash_string_hash, hash_string_eq,
+                               NULL);
+@@ -824,6 +859,18 @@ process (FILE *in, FILE *out)
+   const char *input = read_file (in);
+   Token *tok = tokenize (input);
+ 
++  /* By default, when ptxas is not in PATH, do minimalistic verification,
++     just require that the first non-comment directive is .version.  */
++  if (verify < 0)
++    {
++      size_t i;
++      for (i = 0; tok[i].kind == K_comment; i++)
++	;
++      if (tok[i].kind != K_dotted || !is_keyword (&tok[i], "version"))
++	fatal_error ("missing .version directive at start of file '%s'",
++		     outname);
++    }
++
+   do
+     tok = parse_file (tok);
+   while (tok->kind);
+@@ -897,9 +944,83 @@ fork_execute (const char *prog, char *const *argv)
+   do_wait (prog, pex);
+ }
+ 
++/* Determine if progname is available in PATH.  */
++static bool
++program_available (const char *progname)
++{
++  char *temp = getenv ("PATH");
++  if (temp)
++    {
++      char *startp, *endp, *nstore, *alloc_ptr = NULL;
++      size_t prefixlen = strlen (temp) + 1;
++      size_t len;
++      if (prefixlen < 2)
++	prefixlen = 2;
++
++      len = prefixlen + strlen (progname) + 1;
++#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
++      len += strlen (HOST_EXECUTABLE_SUFFIX);
++#endif
++      if (len < MAX_ALLOCA_SIZE)
++	nstore = (char *) alloca (len);
++      else
++	alloc_ptr = nstore = (char *) malloc (len);
++
++      startp = endp = temp;
++      while (1)
++	{
++	  if (*endp == PATH_SEPARATOR || *endp == 0)
++	    {
++	      if (endp == startp)
++		{
++		  nstore[0] = '.';
++		  nstore[1] = DIR_SEPARATOR;
++		  nstore[2] = '\0';
++		}
++	      else
++		{
++		  memcpy (nstore, startp, endp - startp);
++		  if (! IS_DIR_SEPARATOR (endp[-1]))
++		    {
++		      nstore[endp - startp] = DIR_SEPARATOR;
++		      nstore[endp - startp + 1] = 0;
++		    }
++		  else
++		    nstore[endp - startp] = 0;
++		}
++	      strcat (nstore, progname);
++	      if (! access (nstore, X_OK)
++#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
++		  || ! access (strcat (nstore, HOST_EXECUTABLE_SUFFIX), X_OK)
++#endif
++		 )
++		{
++#if defined (HAVE_SYS_STAT_H) && defined (S_ISREG)
++		  struct stat st;
++		  if (stat (nstore, &st) >= 0 && S_ISREG (st.st_mode))
++#endif
++		    {
++		      free (alloc_ptr);
++		      return true;
++		    }
++		}
++
++	      if (*endp == 0)
++		break;
++	      endp = startp = endp + 1;
++	    }
++	  else
++	    endp++;
++	}
++      free (alloc_ptr);
++    }
++  return false;
++}
++
+ static struct option long_options[] = {
+   {"traditional-format",     no_argument, 0,  0 },
+   {"save-temps",  no_argument,       0,  0 },
++  {"verify",  no_argument,       0,  0 },
+   {"no-verify",  no_argument,       0,  0 },
+   {"help", no_argument, 0, 'h' },
+   {"version", no_argument, 0, 'V' },
+@@ -912,7 +1033,7 @@ main (int argc, char **argv)
+   FILE *in = stdin;
+   FILE *out = stdout;
+   bool verbose __attribute__((unused)) = false;
+-  bool verify = true;
++  int verify = -1;
+   const char *smver = "sm_30";
+ 
+   int o;
+@@ -923,7 +1044,9 @@ main (int argc, char **argv)
+ 	{
+ 	case 0:
+ 	  if (option_index == 2)
+-	    verify = false;
++	    verify = 1;
++	  else if (option_index == 3)
++	    verify = 0;
+ 	  break;
+ 	case 'v':
+ 	  verbose = true;
+@@ -948,7 +1071,8 @@ Usage: nvptx-none-as [option...] [asmfile]\n\
+ Options:\n\
+   -o FILE               Write output to FILE\n\
+   -v                    Be verbose\n\
++  --verify              Do verify output is acceptable to ptxas\n\
+   --no-verify           Do not verify output is acceptable to ptxas\n\
+   --help                Print this help and exit\n\
+   --version             Print version number and exit\n\
+ \n\
+@@ -983,11 +1108,17 @@ This program has absolutely no warranty.\n",
+   if (!in)
+     fatal_error ("cannot open input ptx file");
+ 
+-  process (in, out);
+-  if  (outname)
++  if (outname == NULL)
++    verify = 0;
++  else if (verify == -1)
++    if (program_available ("ptxas"))
++      verify = 1;
++
++  process (in, out, verify, outname);
++  if (outname)
+     fclose (out);
+ 
+-  if (verify && outname)
++  if (verify > 0)
+     {
+       struct obstack argv_obstack;
+       obstack_init (&argv_obstack);
+--- nvptx-tools/configure
++++ nvptx-tools/configure
+@@ -168,7 +168,8 @@ test x\$exitcode = x0 || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
++  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
+   if (eval "$as_required") 2>/dev/null; then :
+   as_have_required=yes
+ else
+@@ -552,11 +553,50 @@ PACKAGE_URL=
+ 
+ ac_unique_file="nvptx-tools"
+ ac_unique_file="nvptx-as.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#ifdef STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# ifdef HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#ifdef HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++#endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif"
++
+ enable_option_checking=no
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ subdirs
+ NVPTX_RUN
++EGREP
++GREP
++CPP
+ CUDA_DRIVER_LDFLAGS
+ CUDA_DRIVER_CPPFLAGS
+ AR
+@@ -635,7 +675,8 @@ LIBS
+ CPPFLAGS
+ CXX
+ CXXFLAGS
+-CCC'
++CCC
++CPP'
+ ac_subdirs_all='libiberty'
+ 
+ # Initialize some variables set by options.
+@@ -1267,6 +1308,7 @@ Some influential environment variables:
+               you have headers in a nonstandard directory <include dir>
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
++  CPP         C preprocessor
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1575,6 +1617,203 @@ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_decl
++
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++    ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  return $ac_retval
++
++} # ac_fn_c_try_cpp
++
++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
++# the include files in INCLUDES and setting the cache variable VAR
++# accordingly.
++ac_fn_c_check_header_mongrel ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++  # Is the header compilable?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
++$as_echo_n "checking $2 usability... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_header_compiler=yes
++else
++  ac_header_compiler=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
++$as_echo_n "checking $2 presence... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <$2>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  ac_header_preproc=yes
++else
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
++  yes:no: )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++esac
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  eval "$3=\$ac_header_compiler"
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++       $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_retval=$ac_status
++fi
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  return $ac_retval
++
++} # ac_fn_c_try_run
++
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_compile
+ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+@@ -3284,6 +3523,418 @@ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_CUGETERRORSTRING $ac_have_decl
+ _ACEOF
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if test "${ac_cv_prog_CPP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++
++else
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$GREP"; then
++  ac_path_GREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in grep ggrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++      $ac_path_GREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_GREP"; then
++    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
++else
++  ac_cv_path_GREP=$GREP
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     if test -z "$EGREP"; then
++  ac_path_EGREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in egrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++      $ac_path_EGREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_EGREP"; then
++    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
++else
++  ac_cv_path_EGREP=$EGREP
++fi
++
++   fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_stdc=yes
++else
++  ac_cv_header_stdc=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then :
++  :
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      return 2;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++for ac_header in unistd.h sys/stat.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra programs to build requiring -lcuda" >&5
+ $as_echo_n "checking for extra programs to build requiring -lcuda... " >&6; }