From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 494 invoked by alias); 6 May 2019 13:57:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 130813 invoked by uid 89); 6 May 2019 13:57:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 06 May 2019 13:57:57 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 8BF0EACD1; Mon, 6 May 2019 13:57:54 +0000 (UTC) Subject: Re: [PATCH] Append to target_gtfiles in order to fix Darwin bootstrap. To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org, =?UTF-8?Q?Dominique_d=27Humi=c3=a8res?= References: <5d3bc640-2100-a33f-37c9-0e69a9c74608@suse.cz> <20190506135241.GZ2706@tucnak> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Message-ID: <9483c3e6-5c54-8c5c-5faf-b0efc08cff1f@suse.cz> Date: Mon, 06 May 2019 13:57:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190506135241.GZ2706@tucnak> Content-Type: multipart/mixed; boundary="------------78B408BDE583705A058FD8FF" X-IsSubscribed: yes X-SW-Source: 2019-05/txt/msg00224.txt.bz2 This is a multi-part message in MIME format. --------------78B408BDE583705A058FD8FF Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-length: 2834 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 >> >> * 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 > --------------78B408BDE583705A058FD8FF Content-Type: text/x-patch; name="0001-Append-to-target_gtfiles-in-order-to-fix-Darwin-boot.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Append-to-target_gtfiles-in-order-to-fix-Darwin-boot.pa"; filename*1="tch" Content-length: 3787 >From 5761aaab91e10390321efec6f7a09001eb93e94d Mon Sep 17 00:00:00 2001 From: marxin 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 * 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 --------------78B408BDE583705A058FD8FF--