On Tue, Oct 10, 2017 at 11:41:20PM +0200, Jan Hubicka wrote:
> it is common mistake to forget updating CPU spefic bits in i386.c while doing
> new CPU tuning.  It is understandble given how large i386.c is and how well
> those are hidden.  This patch moves majority of CPU specific bits into
> x86-tune-* files, organizing them according to purpose and if they are
> CPU specific.
> 
> There are no changes in code/tunings. They will come incrementally.
> 
> Bootstrapped/regtested x86_64-linux, will commit it later today.

This apparently broke bootstrap or cross build for
mingw, cygwin and x86 solaris, tested just with a cross from x86_64-linux
to i686-cygwin and i386-pc-solaris2.11.

Fixed thusly, tested on the above mentioned crosses, committed to trunk
to unbreak bootstrap.

2017-10-14  Jakub Jelinek  <ja...@redhat.com>

        PR bootstrap/82548
        * config.gcc (*-*-solaris2*, i[34567]86-*-cygwin*,
        x86_64-*-cygwin*, i[34567]86-*-mingw* | x86_64-*-mingw*): Append
        objects to extra_objs instead of overwriting it.

--- gcc/config.gcc.jj   2017-10-11 22:37:55.000000000 +0200
+++ gcc/config.gcc      2017-10-14 14:20:11.294528384 +0200
@@ -874,7 +874,7 @@ case ${target} in
   tmake_file="${tmake_file} t-sol2 t-slibgcc"
   c_target_objs="${c_target_objs} sol2-c.o"
   cxx_target_objs="${cxx_target_objs} sol2-c.o sol2-cxx.o"
-  extra_objs="sol2.o sol2-stubs.o"
+  extra_objs="${extra_objs} sol2.o sol2-stubs.o"
   extra_options="${extra_options} sol2.opt"
   case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
     "":yes:* | yes:yes:* )
@@ -1692,7 +1692,7 @@ i[34567]86-*-cygwin*)
        tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
-       extra_objs="winnt.o winnt-stubs.o"
+       extra_objs="${extra_objs} winnt.o winnt-stubs.o"
        c_target_objs="${c_target_objs} msformat-c.o"
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        if test x$enable_threads = xyes; then
@@ -1708,7 +1708,7 @@ x86_64-*-cygwin*)
        tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-cygwin-w64"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
-       extra_objs="winnt.o winnt-stubs.o"
+       extra_objs="${extra_objs} winnt.o winnt-stubs.o"
        c_target_objs="${c_target_objs} msformat-c.o"
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        if test x$enable_threads = xyes; then
@@ -1783,7 +1783,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                *)
                        ;;
        esac
-       extra_objs="winnt.o winnt-stubs.o"
+       extra_objs="${extra_objs} winnt.o winnt-stubs.o"
        c_target_objs="${c_target_objs} msformat-c.o"
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        gas=yes

        Jakub

Reply via email to