On 5/6/19 3:52 PM, Jakub Jelinek wrote:
> On Mon, May 06, 2019 at 03:47:53PM +0200, Martin Liška wrote:
>> The patch append to target_gtfiles at 3 places instead of overwriting
>> that.
>>
>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>>
>> Ready to be installed?
>> Thanks,
>> Martin
>>
>> gcc/ChangeLog:
>>
>> 2019-05-06 Martin Liska <mli...@suse.cz>
>>
>> * config.gcc: Append to target_gtfiles.
>> ---
>> gcc/config.gcc | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>>
>
>> diff --git a/gcc/config.gcc b/gcc/config.gcc
>> index 5124ea00792..f119f82e475 100644
>> --- a/gcc/config.gcc
>> +++ b/gcc/config.gcc
>> @@ -383,7 +383,7 @@ i[34567]86-*-*)
>> cxx_target_objs="i386-c.o"
>> d_target_objs="i386-d.o"
>> extra_objs="x86-tune-sched.o x86-tune-sched-bd.o x86-tune-sched-atom.o
>> x86-tune-sched-core.o i386-options.o i386-builtins.o i386-expand.o
>> i386-features.o"
>> - target_gtfiles="\$(srcdir)/config/i386/i386-builtins.c
>> \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
>> + target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/i386-builtins.c
>> \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
>
> I think there is no need to add $target_gtfiles here, you know it is empty,
> the first spot in config.gcc that touches it is this switch based on CPU.
> Just fix up the indentation.
Ah, got it.
>
>> @@ -416,7 +416,7 @@ x86_64-*-*)
>> d_target_objs="i386-d.o"
>> extra_options="${extra_options} fused-madd.opt"
>> extra_objs="x86-tune-sched.o x86-tune-sched-bd.o x86-tune-sched-atom.o
>> x86-tune-sched-core.o i386-options.o i386-builtins.o i386-expand.o
>> i386-features.o"
>> - target_gtfiles="\$(srcdir)/config/i386/i386-builtins.c
>> \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
>> + target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/i386-builtins.c
>> \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
>> extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
>> pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
>> nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
>
> Ditto.
>
>> @@ -693,7 +693,7 @@ case ${target} in
>> esac
>> tm_file="${tm_file} ${cpu_type}/darwin.h"
>> tm_p_file="${tm_p_file} darwin-protos.h"
>> - target_gtfiles="\$(srcdir)/config/darwin.c"
>> + target_gtfiles="$target_gtfiles \$(srcdir)/config/darwin.c"
>> extra_options="${extra_options} darwin.opt"
>> c_target_objs="${c_target_objs} darwin-c.o"
>> cxx_target_objs="${cxx_target_objs} darwin-c.o"
>>
>
> This is insufficient, needs to be done also in the 3
> target_gtfiles="\$(srcdir)/config/i386/winnt.c"
> cases.
Done that. I'm going to install the patch.
Martin
>
> Ok with those changes.
>
> Jakub
>
>From 5761aaab91e10390321efec6f7a09001eb93e94d Mon Sep 17 00:00:00 2001
From: marxin <mli...@suse.cz>
Date: Mon, 6 May 2019 13:03:59 +0200
Subject: [PATCH] Append to target_gtfiles in order to fix Darwin bootstrap.
gcc/ChangeLog:
2019-05-06 Martin Liska <mli...@suse.cz>
* config.gcc: Append to target_gtfiles and fix indentation.
---
gcc/config.gcc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5124ea00792..6ac187ce0c1 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -383,7 +383,7 @@ i[34567]86-*-*)
cxx_target_objs="i386-c.o"
d_target_objs="i386-d.o"
extra_objs="x86-tune-sched.o x86-tune-sched-bd.o x86-tune-sched-atom.o x86-tune-sched-core.o i386-options.o i386-builtins.o i386-expand.o i386-features.o"
- target_gtfiles="\$(srcdir)/config/i386/i386-builtins.c \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
+ target_gtfiles="\$(srcdir)/config/i386/i386-builtins.c \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
extra_options="${extra_options} fused-madd.opt"
extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
@@ -416,7 +416,7 @@ x86_64-*-*)
d_target_objs="i386-d.o"
extra_options="${extra_options} fused-madd.opt"
extra_objs="x86-tune-sched.o x86-tune-sched-bd.o x86-tune-sched-atom.o x86-tune-sched-core.o i386-options.o i386-builtins.o i386-expand.o i386-features.o"
- target_gtfiles="\$(srcdir)/config/i386/i386-builtins.c \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
+ target_gtfiles="\$(srcdir)/config/i386/i386-builtins.c \$(srcdir)/config/i386/i386-expand.c \$(srcdir)/config/i386/i386-options.c"
extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
@@ -693,7 +693,7 @@ case ${target} in
esac
tm_file="${tm_file} ${cpu_type}/darwin.h"
tm_p_file="${tm_p_file} darwin-protos.h"
- target_gtfiles="\$(srcdir)/config/darwin.c"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/darwin.c"
extra_options="${extra_options} darwin.opt"
c_target_objs="${c_target_objs} darwin-c.o"
cxx_target_objs="${cxx_target_objs} darwin-c.o"
@@ -1855,7 +1855,7 @@ i[34567]86-*-cygwin*)
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h i386/cygwin-stdint.h"
xm_file=i386/xm-cygwin.h
tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
- target_gtfiles="\$(srcdir)/config/i386/winnt.c"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
extra_objs="${extra_objs} winnt.o winnt-stubs.o"
c_target_objs="${c_target_objs} msformat-c.o"
@@ -1871,7 +1871,7 @@ x86_64-*-cygwin*)
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h i386/cygwin-w64.h i386/cygwin-stdint.h"
xm_file=i386/xm-cygwin.h
tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-cygwin-w64"
- target_gtfiles="\$(srcdir)/config/i386/winnt.c"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
extra_objs="${extra_objs} winnt.o winnt-stubs.o"
c_target_objs="${c_target_objs} msformat-c.o"
@@ -1939,7 +1939,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
;;
esac
native_system_header_dir=/mingw/include
- target_gtfiles="\$(srcdir)/config/i386/winnt.c"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
case ${target} in
*-w64-*)
--
2.21.0
