Merge pull request #3323 from citrus-it/gcc13.2

gcc13: update from 13.1 to 13.2

build/gcc13/build.sh

@@ -19,7 +19,7 @@
 
 PKG=developer/gcc13
 PROG=gcc
-VER=13.1.0
+VER=13.2.0
 ILVER=il-0
 SUMMARY="gcc $VER-$ILVER"
 DESC="The GNU Compiler Collection"

build/gcc13/files/soname.ignore

@@ -1,3 +1,3 @@
 opt/gcc-13/lib/amd64/libcc1.so.0.0.0
-opt/gcc-13/lib/gcc/x86_64-pc-solaris2.11/13.1.0/plugin/libcc1plugin.so.0.0.0
-opt/gcc-13/lib/gcc/x86_64-pc-solaris2.11/13.1.0/plugin/libcp1plugin.so.0.0.0
+opt/gcc-13/lib/gcc/x86_64-pc-solaris2.11/13.2.0/plugin/libcc1plugin.so.0.0.0
+opt/gcc-13/lib/gcc/x86_64-pc-solaris2.11/13.2.0/plugin/libcp1plugin.so.0.0.0

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

@@ -1,4 +1,4 @@
-From def33d006c7e2f464250ae1a7ddd7f29a49591d9 Mon Sep 17 00:00:00 2001
+From 976216172721d886fbbb6ec469e4366aedfd7616 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/gcc13/patches/0003-gcc-enable-the-.eh_frame-based-unwinder.patch

@@ -1,4 +1,4 @@
-From 7a4138ef910313ae3ba37531634b744cb18d6768 Mon Sep 17 00:00:00 2001
+From 5f81f0a0fc40d9b2b49da96abe152f75ddb20ed1 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 c7b26d1927d..6d06fe9226d 100755
+index c7b26d1927de..6d06fe9226d7 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -24292,11 +24292,12 @@ if test $in_tree_ld != yes ; then
@@ -38,7 +38,7 @@ index c7b26d1927d..6d06fe9226d 100755
          ;;
      esac
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 09082e8ccae..4a3f1692475 100644
+index 09082e8ccae3..4a3f16924759 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -3096,11 +3096,12 @@ if test $in_tree_ld != yes ; then

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

@@ -1,4 +1,4 @@
-From 9e5c37ce0a8d139af065560353aee158585cd03e Mon Sep 17 00:00:00 2001
+From e6fd28ba37bd8a5468c81290be8a9a174488f0e2 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.cc b/gcc/intl.cc
-index 15bbb1acd9b..f3a681dbaba 100644
+index 15bbb1acd9b1..f3a681dbabaf 100644
 --- a/gcc/intl.cc
 +++ b/gcc/intl.cc
 @@ -74,17 +74,11 @@ gcc_init_libintl (void)

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

@@ -1,4 +1,4 @@
-From e88ad2733f71aa9ebd5f62715f2ef195df22d00c Mon Sep 17 00:00:00 2001
+From a84b9e8a795b2892fd839b6cdfe4123d1d5e26e0 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 862c474d3c8..73560e307c7 100644
+index 862c474d3c8f..73560e307c7a 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -2806,6 +2806,10 @@ fstrict-aliasing
@@ -36,7 +36,7 @@ index 862c474d3c8..73560e307c7 100644
  Common
  Treat signed overflow as undefined.  Negated as -fwrapv -fwrapv-pointer.
 diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
-index fbd33a6bfd1..032a4fbcb61 100644
+index a551b8b9d9b3..e51b4fa1c0ed 100644
 --- a/gcc/config/i386/i386.cc
 +++ b/gcc/config/i386/i386.cc
 @@ -1158,6 +1158,7 @@ ix86_function_regparm (const_tree type, const_tree decl)
@@ -56,10 +56,10 @@ index fbd33a6bfd1..032a4fbcb61 100644
      {
        if (target->local && target->can_change_signature)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index a38547f53e5..b4cc9df2889 100644
+index de40f62e219c..8bd0a8357d12 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -7647,6 +7647,12 @@ with multiple statement cases using flow-sensitive points-to information.
+@@ -7651,6 +7651,12 @@ with multiple statement cases using flow-sensitive points-to information.
  Only warns when the converted pointer is dereferenced.
  Does not warn about incomplete types.
 
@@ -73,7 +73,7 @@ index a38547f53e5..b4cc9df2889 100644
  @opindex Wno-strict-overflow
  @item -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/gcc13/patches/0006-allow-the-global-disabling-of-function-cloning.patch

@@ -1,4 +1,4 @@
-From 682f0fc9aceed430fc17a84bdc43800319f58652 Mon Sep 17 00:00:00 2001
+From b76e65d545bbf9c3c83e06ccecbe75f34a5ae07a 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.cc b/gcc/attribs.cc
-index b1300018d1e..6f17d96a832 100644
+index b1300018d1e8..6f17d96a8327 100644
 --- a/gcc/attribs.cc
 +++ b/gcc/attribs.cc
 @@ -695,6 +695,15 @@ decl_attributes (tree *node, tree attributes, int flags,
@@ -38,7 +38,7 @@ index b1300018d1e..6f17d96a832 100644
 
    /* Note that attributes on the same declaration are not necessarily
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 73560e307c7..d5460f4727c 100644
+index 73560e307c7a..d5460f4727c2 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -1216,6 +1216,11 @@ fcode-hoisting
@@ -54,7 +54,7 @@ index 73560e307c7..d5460f4727c 100644
  Common 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 b4cc9df2889..f7d2d33c1f9 100644
+index 8bd0a8357d12..cadce96a0f5b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -535,6 +535,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -65,7 +65,7 @@ index b4cc9df2889..f7d2d33c1f9 100644
  -fcombine-stack-adjustments  -fconserve-stack
  -fcompare-elim  -fcprop-registers  -fcrossjumping
  -fcse-follow-jumps  -fcse-skip-blocks  -fcx-fortran-rules
-@@ -12773,6 +12774,15 @@ and then tries to find ways to combine them.
+@@ -12777,6 +12778,15 @@ and then tries to find ways to combine them.
 
  Enabled by default at @option{-O1} and higher.
 

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

@@ -1,4 +1,4 @@
-From 2fffa08c18dae43bc1903946ade30d9b132f854b Mon Sep 17 00:00:00 2001
+From 953da77e50edacc733e1607648e2e63e6e10ce01 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/gcc13/patches/0008-sol2-enable-full-__cxa_atexit-support.patch

@@ -1,4 +1,4 @@
-From 89986e367a99c729bac4c65c7f74e9bfe4947ed6 Mon Sep 17 00:00:00 2001
+From d4d29b2bd6571e92a5f796098d8560638bbac32b 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 cba5ac0fc54..d05e27aad98 100644
+index cba5ac0fc540..d05e27aad989 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
 @@ -209,7 +209,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -31,10 +31,10 @@ index cba5ac0fc54..d05e27aad98 100644
 
  #undef  ENDFILE_SPEC
 diff --git a/libgcc/config.host b/libgcc/config.host
-index b9975de9023..3e4405f08b4 100644
+index 9d7212028d06..555f13dd96a2 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -295,7 +295,7 @@ case ${host} in
+@@ -313,7 +313,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 b9975de9023..3e4405f08b4 100644
    if test $with_gnu_ld = yes; then
      tmake_file="$tmake_file t-slibgcc-gld"
    else
-@@ -315,6 +315,7 @@ case ${host} in
+@@ -333,6 +333,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/gcc13/patches/0009-i386-Save-integer-passed-arguments-to-the-stack-to-a.patch

@@ -1,4 +1,4 @@
-From 40128ef90d011239ccac18e7aaaf91a4933d1b68 Mon Sep 17 00:00:00 2001
+From 1be0ff5f8b7c6868fe453ad6810edba3aa385520 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,10 +44,10 @@ Originally implemented in:
  create mode 100644 gcc/testsuite/gcc.target/i386/msave-args-push.c
 
 diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc
-index 2cb0bddcd35..a375e16da20 100644
+index 37cb5a0dcc43..e45478d606bb 100644
 --- a/gcc/config/i386/i386-options.cc
 +++ b/gcc/config/i386/i386-options.cc
-@@ -2511,6 +2511,9 @@ ix86_option_override_internal (bool main_args_p,
+@@ -2515,6 +2515,9 @@ ix86_option_override_internal (bool main_args_p,
        &= ~((OPTION_MASK_ISA_BMI | OPTION_MASK_ISA_BMI2 | OPTION_MASK_ISA_TBM)
  	   & ~opts->x_ix86_isa_flags_explicit);
 
@@ -58,7 +58,7 @@ index 2cb0bddcd35..a375e16da20 100644
       PREFERRED_STACK_BOUNDARY_DEFAULT.  */
    ix86_preferred_stack_boundary = PREFERRED_STACK_BOUNDARY_DEFAULT;
 diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
-index 032a4fbcb61..cb668347c61 100644
+index e51b4fa1c0ed..25ae3371a45f 100644
 --- a/gcc/config/i386/i386.cc
 +++ b/gcc/config/i386/i386.cc
 @@ -422,6 +422,9 @@ static bool i386_asm_output_addr_const_extra (FILE *, rtx);
@@ -321,10 +321,10 @@ index 032a4fbcb61..cb668347c61 100644
      otherwise zero.  */
 
 diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
-index 1da6dce8e0b..926a2f40b70 100644
+index 27b9783cae84..383c55a66f30 100644
 --- a/gcc/config/i386/i386.h
 +++ b/gcc/config/i386/i386.h
-@@ -2523,6 +2523,11 @@ enum avx_u128_state
+@@ -2525,6 +2525,11 @@ enum avx_u128_state
 
     saved frame pointer			if frame_pointer_needed
  					<- HARD_FRAME_POINTER
@@ -336,15 +336,15 @@ index 1da6dce8e0b..926a2f40b70 100644
     [saved regs]
  					<- reg_save_offset
     [padding0]
-@@ -2556,6 +2561,7 @@ enum avx_u128_state
+@@ -2558,6 +2563,7 @@ enum avx_u128_state
    */
  struct GTY(()) ix86_frame
  {
 +  int nmsave_args;
    int nsseregs;
    int nregs;
    int va_arg_size;
-@@ -2567,6 +2573,7 @@ struct GTY(()) ix86_frame
+@@ -2569,6 +2575,7 @@ struct GTY(()) ix86_frame
    HOST_WIDE_INT hard_frame_pointer_offset;
    HOST_WIDE_INT stack_pointer_offset;
    HOST_WIDE_INT hfp_save_offset;
@@ -353,7 +353,7 @@ index 1da6dce8e0b..926a2f40b70 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 d74f6b1f8fc..2daaabdcc85 100644
+index d74f6b1f8fc3..2daaabdcc859 100644
 --- a/gcc/config/i386/i386.opt
 +++ b/gcc/config/i386/i386.opt
 @@ -522,6 +522,16 @@ mtls-direct-seg-refs
@@ -374,10 +374,10 @@ index d74f6b1f8fc..2daaabdcc85 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 f7d2d33c1f9..d381d07d047 100644
+index cadce96a0f5b..a27334f8b3a8 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -20150,6 +20150,10 @@ addresses and sizes of sections.  Programs can be statically linked only.  The
+@@ -20154,6 +20154,10 @@ addresses and sizes of sections.  Programs can be statically linked only.  The
  @option{-mcmodel=large} option is incompatible with @option{-mabi=ilp32},
  @option{-fpic} and @option{-fPIC}.
 
@@ -389,7 +389,7 @@ index f7d2d33c1f9..d381d07d047 100644
  @opindex mno-strict-align
  @item -mstrict-align
 diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc
-index 1a0015ce00f..24471bed6d4 100644
+index 4ab625498c98..957165a4b0a0 100644
 --- a/gcc/dwarf2out.cc
 +++ b/gcc/dwarf2out.cc
 @@ -24054,6 +24054,11 @@ gen_subprogram_die (tree decl, dw_die_ref context_die)
@@ -406,7 +406,7 @@ index 1a0015ce00f..24471bed6d4 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 7ab3ee611fd..d5f8c6b7dec 100644
+index 7ab3ee611fd4..d5f8c6b7dece 100644
 --- a/include/dwarf2.def
 +++ b/include/dwarf2.def
 @@ -467,6 +467,8 @@ DW_TAG (DW_AT_GNU_denominator, 0x2304)

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

@@ -1,4 +1,4 @@
-From 7dc9135ee12c185365f0a70aed597f05cf5afe11 Mon Sep 17 00:00:00 2001
+From f14aa1018632475a7c24bbce87ef581e5d987a58 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.cc b/gcc/config/sol2-c.cc
-index f2f3ae5f5bb..604766bb2cd 100644
+index f2f3ae5f5bbe..604766bb2cd1 100644
 --- a/gcc/config/sol2-c.cc
 +++ b/gcc/config/sol2-c.cc
 @@ -40,7 +40,10 @@ static const format_length_info cmn_err_length_specs[] =

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

@@ -1,4 +1,4 @@
-From ec2f82b1510bce902c9fdca611b4998a942e664e Mon Sep 17 00:00:00 2001
+From bdd2a63ff9cfccb56b8f517dfaefea040440e01f 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.cc b/gcc/config/sol2-c.cc
-index 604766bb2cd..45d083c2ce0 100644
+index 604766bb2cd1..45d083c2ce00 100644
 --- a/gcc/config/sol2-c.cc
 +++ b/gcc/config/sol2-c.cc
 @@ -67,7 +67,7 @@ static const format_char_info cmn_err_char_table[] =

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

@@ -1,4 +1,4 @@
-From 65a68cf10a89b2aae8061d2f9452a2467fa00305 Mon Sep 17 00:00:00 2001
+From 4cc09b9d53f045c063bc97833d7fd0ba3112f132 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.cc b/gcc/config/i386/i386-options.cc
-index a375e16da20..5b42392bc5c 100644
+index e45478d606bb..d1f1e7c5067a 100644
 --- a/gcc/config/i386/i386-options.cc
 +++ b/gcc/config/i386/i386-options.cc
-@@ -2965,6 +2965,15 @@ ix86_option_override_internal (bool main_args_p,
+@@ -2971,6 +2971,15 @@ ix86_option_override_internal (bool main_args_p,
        free (str);
      }
 
@@ -31,7 +31,7 @@ index a375e16da20..5b42392bc5c 100644
       options.  */
    if (main_args_p)
 diff --git a/gcc/opts.cc b/gcc/opts.cc
-index fb2e5388ab1..bf4275621eb 100644
+index fb2e5388ab19..bf4275621eba 100644
 --- a/gcc/opts.cc
 +++ b/gcc/opts.cc
 @@ -577,7 +577,7 @@ static const struct default_options default_options_table[] =