Merge pull request #3718 from citrus-it/gccr46

gcc10: update to 10.5.0-il-2 (r151046)

build/gcc-runtime/build-runtime++.sh

@@ -19,7 +19,7 @@
 
 PKG=system/library/g++-runtime
 PROG=libstdc++
-VER=12
+VER=14
 SUMMARY="GNU C++ compiler runtime dependencies"
 DESC="$SUMMARY"
 
@@ -41,7 +41,7 @@ if is_cross; then
 else
     pushd $DESTDIR >/dev/null
     mkdir -p usr/lib/amd64
-    for v in `seq 5 $VER`; do
+    for v in `seq 5 12` $VER; do
         install_lib $v "$libs" amd64
     done
     install_unversioned $SHARED_GCC_VER "$libs" amd64

build/gcc-runtime/build-runtime.sh

@@ -19,7 +19,7 @@
 
 PKG=system/library/gcc-runtime
 PROG=libgcc_s
-VER=12
+VER=14
 SUMMARY="GNU compiler runtime dependencies"
 DESC="$SUMMARY"
 
@@ -46,7 +46,7 @@ else
 
     logcmd mkdir -p usr/lib/amd64
 
-    for v in `seq 5 $VER`; do
+    for v in `seq 5 12` $VER; do
         install_lib $v "$libs" amd64
         # The gcc-runtime package provides the 64 -> amd64 links
         logcmd ln -s amd64 usr/gcc/$v/lib/64

build/gcc10/build.sh

@@ -19,8 +19,8 @@
 
 PKG=developer/gcc10
 PROG=gcc
-VER=10.4.0
-ILVER=il-1
+VER=10.5.0
+ILVER=il-2
 SUMMARY="gcc $VER-$ILVER"
 DESC="The GNU Compiler Collection"
 

build/gcc10/files/soname.ignore

@@ -1,3 +1,3 @@
 opt/gcc-10/lib/amd64/libcc1.so.0.0.0
-opt/gcc-10/lib/gcc/x86_64-pc-solaris2.11/10.4.0/plugin/libcc1plugin.so.0.0.0
-opt/gcc-10/lib/gcc/x86_64-pc-solaris2.11/10.4.0/plugin/libcp1plugin.so.0.0.0
+opt/gcc-10/lib/gcc/x86_64-pc-solaris2.11/10.5.0/plugin/libcc1plugin.so.0.0.0
+opt/gcc-10/lib/gcc/x86_64-pc-solaris2.11/10.5.0/plugin/libcp1plugin.so.0.0.0

build/gcc10/patches/0002-compare_tests-Use-nawk-1-on-illumos-since-awk-1-is-o.patch

@@ -1,4 +1,4 @@
-From 39a8de4725bfd4e1cfa9753dafb14a39a269a1f0 Mon Sep 17 00:00:00 2001
+From bdab10d0fe54a87dce2e9be2f6f56fbe38a119c9 Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Tue, 26 Jan 2016 14:24:11 -0500
 Subject: compare_tests: Use nawk(1) on illumos, since awk(1) is
@@ -9,7 +9,7 @@ Subject: compare_tests: Use nawk(1) on illumos, since awk(1) is
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/contrib/compare_tests b/contrib/compare_tests
-index 2dfa8640756..6616a201f23 100755
+index 2dfa8640756a..6616a201f23b 100755
 --- a/contrib/compare_tests
 +++ b/contrib/compare_tests
 @@ -108,8 +108,15 @@ elif [ -d "$1" -o -d "$2" ] ; then

build/gcc10/patches/0003-gcc-enable-the-.eh_frame-based-unwinder.patch

@@ -1,4 +1,4 @@
-From ad48400aa2f8769068ed4df0379c5b20da951d21 Mon Sep 17 00:00:00 2001
+From 0a18a3bc3845ca327aba7a160e78748ad57b9197 Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Wed, 5 Mar 2014 04:12:52 +0000
 Subject: gcc: enable the .eh_frame based unwinder
@@ -9,7 +9,7 @@ Subject: gcc: enable the .eh_frame based unwinder
  2 files changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/gcc/configure b/gcc/configure
-index 53c27dba58e..077f8f5ef0c 100755
+index 53c27dba58ea..077f8f5ef0c8 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -23541,11 +23541,12 @@ if test $in_tree_ld != yes ; then
@@ -38,7 +38,7 @@ index 53c27dba58e..077f8f5ef0c 100755
          ;;
      esac
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index c3efabc2e5e..6a02496cb7b 100644
+index c3efabc2e5e9..6a02496cb7b8 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -2894,11 +2894,12 @@ if test $in_tree_ld != yes ; then

build/gcc10/patches/0004-intl-Don-t-use-UTF-8-quotes.-Ever.patch

@@ -1,4 +1,4 @@
-From 89747e35e17e3727ae44cc0edcec2712da84532c Mon Sep 17 00:00:00 2001
+From 9369656018034382d93c9249b9b649b47b288e31 Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Tue, 11 Mar 2014 21:50:30 +0000
 Subject: intl: Don't use UTF-8 quotes.  Ever.
@@ -8,7 +8,7 @@ Subject: intl: Don't use UTF-8 quotes.  Ever.
  1 file changed, 4 insertions(+), 13 deletions(-)
 
 diff --git a/gcc/intl.c b/gcc/intl.c
-index e8108b7dc37..91ddd9a6314 100644
+index e8108b7dc37f..91ddd9a63146 100644
 --- a/gcc/intl.c
 +++ b/gcc/intl.c
 @@ -74,17 +74,11 @@ gcc_init_libintl (void)

build/gcc10/patches/0005-Implement-fstrict-calling-conventions.patch

@@ -1,4 +1,4 @@
-From 7971f944afc0546024ceff15da607c6b5cf21fa4 Mon Sep 17 00:00:00 2001
+From 1b1f559f447d9c5653826b32b2327230e56a65df Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Sat, 27 Oct 2012 02:44:09 +0100
 Subject: Implement -fstrict-calling-conventions
@@ -21,7 +21,7 @@ later which, given the odds, is likely to be necessary.
  create mode 100644 gcc/testsuite/gcc.target/i386/strict-cc.c
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..561e7af9783 100644
+index ec5235c3a41c..561e7af97836 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -2604,6 +2604,10 @@ fstrict-aliasing
@@ -36,7 +36,7 @@ index ec5235c3a41..561e7af9783 100644
  Common Report
  Treat signed overflow as undefined.  Negated as -fwrapv -fwrapv-pointer.
 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 80486f8f10c..6cc1fc9a6c8 100644
+index 80486f8f10c4..6cc1fc9a6c85 100644
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
 @@ -1117,6 +1117,7 @@ ix86_function_regparm (const_tree type, const_tree decl)
@@ -56,7 +56,7 @@ index 80486f8f10c..6cc1fc9a6c8 100644
      {
        if (target->local && target->can_change_signature)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index d7c787af226..c7b8c1b4cec 100644
+index a2f05de39cf8..42103c52287b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -6291,6 +6291,12 @@ with multiple statement cases using flow-sensitive points-to information.
@@ -73,7 +73,7 @@ index d7c787af226..c7b8c1b4cec 100644
  @itemx -Wstrict-overflow=@var{n}
  @opindex Wstrict-overflow
 diff --git a/gcc/testsuite/gcc.target/i386/local.c b/gcc/testsuite/gcc.target/i386/local.c
-index f4444951e12..3a487583d81 100644
+index f4444951e123..3a487583d81f 100644
 --- a/gcc/testsuite/gcc.target/i386/local.c
 +++ b/gcc/testsuite/gcc.target/i386/local.c
 @@ -1,5 +1,6 @@
@@ -86,7 +86,7 @@ index f4444951e12..3a487583d81 100644
 
 diff --git a/gcc/testsuite/gcc.target/i386/strict-cc.c b/gcc/testsuite/gcc.target/i386/strict-cc.c
 new file mode 100644
-index 00000000000..fa0543e52ff
+index 000000000000..fa0543e52ff6
 --- /dev/null
 +++ b/gcc/testsuite/gcc.target/i386/strict-cc.c
 @@ -0,0 +1,24 @@

build/gcc10/patches/0006-allow-the-global-disabling-of-function-cloning.patch

@@ -1,4 +1,4 @@
-From 81e027dd684344c492e74be9e39c09b05c2a1422 Mon Sep 17 00:00:00 2001
+From d7ccd6b88452957e8926fb233d39bc37da8e1342 Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Sun, 30 Sep 2012 16:44:14 -0400
 Subject: allow the global disabling of function cloning
@@ -18,7 +18,7 @@ optimization ineffective, and our source safe for debuggers everywhere.
  3 files changed, 24 insertions(+)
 
 diff --git a/gcc/attribs.c b/gcc/attribs.c
-index 7d0f4b5b7b4..2d8f34d371a 100644
+index 7d0f4b5b7b4f..2d8f34d371a1 100644
 --- a/gcc/attribs.c
 +++ b/gcc/attribs.c
 @@ -543,6 +543,15 @@ decl_attributes (tree *node, tree attributes, int flags,
@@ -38,7 +38,7 @@ index 7d0f4b5b7b4..2d8f34d371a 100644
 
    /* Note that attributes on the same declaration are not necessarily
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 561e7af9783..a2e214337f0 100644
+index 561e7af97836..a2e214337f0a 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -1145,6 +1145,11 @@ fcode-hoisting
@@ -54,7 +54,7 @@ index 561e7af9783..a2e214337f0 100644
  Common Report Var(flag_combine_stack_adjustments) Optimization
  Looks for opportunities to reduce stack adjustments and stack references.
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c7b8c1b4cec..3c3834fa1c6 100644
+index 42103c52287b..4f20683586c5 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -461,6 +461,7 @@ Objective-C and Objective-C++ Dialects}.

build/gcc10/patches/0007-strict-cc2-check-that-disabling-function-cloning-pre.patch

@@ -1,4 +1,4 @@
-From 1529d36beda90163c1850f9937fc00401a1c3924 Mon Sep 17 00:00:00 2001
+From 3760e8d66c5035d6620b5ea8c0b22bdd26d6bdd8 Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Tue, 4 Mar 2014 02:58:33 +0000
 Subject: strict-cc2: check that disabling function cloning
@@ -11,7 +11,7 @@ Subject: strict-cc2: check that disabling function cloning
 
 diff --git a/gcc/testsuite/gcc.dg/fno-clone-preserves-unused-args.c b/gcc/testsuite/gcc.dg/fno-clone-preserves-unused-args.c
 new file mode 100644
-index 00000000000..0955381c848
+index 000000000000..0955381c8480
 --- /dev/null
 +++ b/gcc/testsuite/gcc.dg/fno-clone-preserves-unused-args.c
 @@ -0,0 +1,28 @@

build/gcc10/patches/0008-sol2-enable-full-__cxa_atexit-support.patch

@@ -1,4 +1,4 @@
-From 0f070e743e47c7020032fff01b5068f3c08db54f Mon Sep 17 00:00:00 2001
+From 0328c7baf41ecc12a9961cc96596ab9d3820734f Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Tue, 4 Mar 2014 22:11:03 +0000
 Subject: sol2: enable full __cxa_atexit support
@@ -9,7 +9,7 @@ Subject: sol2: enable full __cxa_atexit support
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 91b4602b49d..a60fcba2864 100644
+index 91b4602b49de..a60fcba2864a 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
 @@ -210,7 +210,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -31,10 +31,10 @@ index 91b4602b49d..a60fcba2864 100644
 
  #undef  ENDFILE_SPEC
 diff --git a/libgcc/config.host b/libgcc/config.host
-index 89f41b56000..cfd0077e7d1 100644
+index 2b276ce3436e..3fd31396f993 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -290,7 +290,7 @@ case ${host} in
+@@ -308,7 +308,7 @@ case ${host} in
  *-*-solaris2*)
    # Unless linker support and dl_iterate_phdr are present,
    # unwind-dw2-fde-dip.c automatically falls back to unwind-dw2-fde.c.
@@ -43,7 +43,7 @@ index 89f41b56000..cfd0077e7d1 100644
    if test $with_gnu_ld = yes; then
      tmake_file="$tmake_file t-slibgcc-gld"
    else
-@@ -310,6 +310,7 @@ case ${host} in
+@@ -328,6 +328,7 @@ case ${host} in
        i?86-*-solaris2* | x86_64-*-solaris2*)
          # Solaris 10+/x86 provides crt1.o, crti.o, crtn.o, and gcrt1.o as
          # part of the base system.

build/gcc10/patches/0009-i386-Save-integer-passed-arguments-to-the-stack-to-a.patch

@@ -1,4 +1,4 @@
-From 3d960557645ad4ba4a55cfdd0e49c0f82e094e76 Mon Sep 17 00:00:00 2001
+From 31561713e2e6657d7609e7221c4b9906a845a6bf Mon Sep 17 00:00:00 2001
 From: Richard Lowe <[email protected]>
 Date: Sat, 23 Jan 2016 22:14:56 -0500
 Subject: i386: Save integer-passed arguments to the stack, to
@@ -44,7 +44,7 @@ Originally implemented in:
  create mode 100644 gcc/testsuite/gcc.target/i386/msave-args-push.c
 
 diff --git a/gcc/config/i386/i386-options.c b/gcc/config/i386/i386-options.c
-index 7bb644b67b4..6f05496841b 100644
+index 3510ad5f5d71..4d1e71b30d84 100644
 --- a/gcc/config/i386/i386-options.c
 +++ b/gcc/config/i386/i386-options.c
 @@ -2505,6 +2505,9 @@ ix86_option_override_internal (bool main_args_p,
@@ -58,7 +58,7 @@ index 7bb644b67b4..6f05496841b 100644
       PREFERRED_STACK_BOUNDARY_DEFAULT.  */
    ix86_preferred_stack_boundary = PREFERRED_STACK_BOUNDARY_DEFAULT;
 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 6cc1fc9a6c8..3a42bf9a330 100644
+index 6cc1fc9a6c85..3a42bf9a3304 100644
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
 @@ -416,6 +416,9 @@ static bool i386_asm_output_addr_const_extra (FILE *, rtx);
@@ -321,7 +321,7 @@ index 6cc1fc9a6c8..3a42bf9a330 100644
      otherwise zero.  */
 
 diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
-index 4540cd9be26..22654527cb2 100644
+index 4540cd9be264..22654527cb22 100644
 --- a/gcc/config/i386/i386.h
 +++ b/gcc/config/i386/i386.h
 @@ -2627,6 +2627,11 @@ enum avx_u128_state
@@ -353,7 +353,7 @@ index 4540cd9be26..22654527cb2 100644
    HOST_WIDE_INT stack_realign_allocate;
    HOST_WIDE_INT stack_realign_offset;
 diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
-index 552e4231dd5..259ad8e16b9 100644
+index 552e4231dd5a..259ad8e16b99 100644
 --- a/gcc/config/i386/i386.opt
 +++ b/gcc/config/i386/i386.opt
 @@ -514,6 +514,16 @@ mtls-direct-seg-refs
@@ -374,7 +374,7 @@ index 552e4231dd5..259ad8e16b9 100644
  Target RejectNegative Negative(mtune=) Joined Var(ix86_tune_string)
  Schedule code for given CPU.
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 3c3834fa1c6..590efd0f6fe 100644
+index 4f20683586c5..bc9cf02e48b9 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -16835,6 +16835,10 @@ addresses and sizes of sections.  Programs can be statically linked only.  The
@@ -389,7 +389,7 @@ index 3c3834fa1c6..590efd0f6fe 100644
  @itemx -mno-strict-align
  @opindex mstrict-align
 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
-index fea0a4b899f..c5366ed8877 100644
+index fea0a4b899f6..c5366ed88776 100644
 --- a/gcc/dwarf2out.c
 +++ b/gcc/dwarf2out.c
 @@ -23338,6 +23338,11 @@ gen_subprogram_die (tree decl, dw_die_ref context_die)
@@ -406,7 +406,7 @@ index fea0a4b899f..c5366ed8877 100644
 
 diff --git a/gcc/testsuite/gcc.target/i386/msave-args-mov.c b/gcc/testsuite/gcc.target/i386/msave-args-mov.c
 new file mode 100644
-index 00000000000..a2ca76752a9
+index 000000000000..a2ca76752a96
 --- /dev/null
 +++ b/gcc/testsuite/gcc.target/i386/msave-args-mov.c
 @@ -0,0 +1,26 @@
@@ -438,7 +438,7 @@ index 00000000000..a2ca76752a9
 +/* { dg-final { cleanup-saved-temps } } */
 diff --git a/gcc/testsuite/gcc.target/i386/msave-args-push.c b/gcc/testsuite/gcc.target/i386/msave-args-push.c
 new file mode 100644
-index 00000000000..fbe053dadc8
+index 000000000000..fbe053dadc8b
 --- /dev/null
 +++ b/gcc/testsuite/gcc.target/i386/msave-args-push.c
 @@ -0,0 +1,26 @@
@@ -469,7 +469,7 @@ index 00000000000..fbe053dadc8
 +/* { dg-final { scan-assembler "pushq\t%r8" } } */
 +/* { dg-final { cleanup-saved-temps } } */
 diff --git a/include/dwarf2.def b/include/dwarf2.def
-index d8a8cce7947..4a0175bd7b3 100644
+index d8a8cce79478..4a0175bd7b3f 100644
 --- a/include/dwarf2.def
 +++ b/include/dwarf2.def
 @@ -467,6 +467,8 @@ DW_TAG (DW_AT_GNU_denominator, 0x2304)

build/gcc10/patches/0010-16-update-cmn_err-format-specifier.patch

@@ -1,4 +1,4 @@
-From 125d83c3588716e4dbb69e1ceeba54153dd59526 Mon Sep 17 00:00:00 2001
+From c582c89d2d1fd1227da47affa62ae7c3cd7b9386 Mon Sep 17 00:00:00 2001
 From: Yuri Pankov <[email protected]>
 Date: Sat, 5 Nov 2016 05:26:47 +0300
 Subject: 16 update cmn_err format specifier Reviewed by: Richard
@@ -9,7 +9,7 @@ Subject: 16 update cmn_err format specifier Reviewed by: Richard
  1 file changed, 13 insertions(+), 9 deletions(-)
 
 diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c
-index 9eaf43c4c98..202de74d360 100644
+index 9eaf43c4c982..202de74d3604 100644
 --- a/gcc/config/sol2-c.c
 +++ b/gcc/config/sol2-c.c
 @@ -40,7 +40,10 @@ static const format_length_info cmn_err_length_specs[] =

build/gcc10/patches/0011-19-cmn_err-b-conversion-should-accept-0-flag.patch

@@ -1,4 +1,4 @@
-From 3b711063f3340d244bb07f3b1436ec453168f4b7 Mon Sep 17 00:00:00 2001
+From 2a5b5774b6d0701e3fa5e1aab4a083476ada6a28 Mon Sep 17 00:00:00 2001
 From: Yuri Pankov <[email protected]>
 Date: Mon, 13 Feb 2017 18:14:45 +0300
 Subject: 19 cmn_err %b conversion should accept 0 flag Reviewed
@@ -10,7 +10,7 @@ Subject: 19 cmn_err %b conversion should accept 0 flag Reviewed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c
-index 202de74d360..4916d686771 100644
+index 202de74d3604..4916d6867716 100644
 --- a/gcc/config/sol2-c.c
 +++ b/gcc/config/sol2-c.c
 @@ -67,7 +67,7 @@ static const format_char_info cmn_err_char_table[] =

build/gcc10/patches/0012-We-never-want-to-omit-the-frame-pointer-regardless-o.patch

@@ -1,4 +1,4 @@
-From 9ff0483ae7e35f507b040586cfc9e85f5888c3fa Mon Sep 17 00:00:00 2001
+From 29b0ccf72afbe51f064297b7784d91e4ec93043a Mon Sep 17 00:00:00 2001
 From: Andy Fiddaman <[email protected]>
 Date: Thu, 25 Oct 2018 18:19:36 +0000
 Subject: We never want to omit the frame pointer, regardless of
@@ -11,10 +11,10 @@ Subject: We never want to omit the frame pointer, regardless of
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/gcc/config/i386/i386-options.c b/gcc/config/i386/i386-options.c
-index 6f05496841b..8605ef21dbc 100644
+index 4d1e71b30d84..309d1ba6f583 100644
 --- a/gcc/config/i386/i386-options.c
 +++ b/gcc/config/i386/i386-options.c
-@@ -2904,6 +2904,15 @@ ix86_option_override_internal (bool main_args_p,
+@@ -2906,6 +2906,15 @@ ix86_option_override_internal (bool main_args_p,
        free (str);
      }
 
@@ -31,7 +31,7 @@ index 6f05496841b..8605ef21dbc 100644
       options.  */
    if (main_args_p)
 diff --git a/gcc/opts.c b/gcc/opts.c
-index 73162528938..5e0ea01a0a1 100644
+index 731625289381..5e0ea01a0a11 100644
 --- a/gcc/opts.c
 +++ b/gcc/opts.c
 @@ -439,7 +439,7 @@ static const struct default_options default_options_table[] =