From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39345 invoked by alias); 10 May 2019 20:15:04 -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 39316 invoked by uid 89); 10 May 2019 20:15:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=H*r:314a, H*Ad:D*fr, H*r:a17, UD:i386-options.c X-HELO: mail-ed1-f66.google.com Received: from mail-ed1-f66.google.com (HELO mail-ed1-f66.google.com) (209.85.208.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 10 May 2019 20:15:02 +0000 Received: by mail-ed1-f66.google.com with SMTP id p27so6727722eda.1 for ; Fri, 10 May 2019 13:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gwmail-gwu-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=RzdNzEenUu6SF9dljUizEjXQ6f6bHmh6h6/t1ulMrM8=; b=YZZw+2pyZV+YR2Vg+5btrMVaudD1rGgpsOBMYKDxNenY/xys7YRBrJ7Pw681Ub1i67 SFT0o0GMtlb7s/hLIgIRuWp5foW/lvnaVtGDmmXhYTbMCaAC26D4V00LxSYylGhzTtWK NU44N58/DtH+J45DERGGfiRhvTvwqpBIUC/rjb/g96FQ9OUX9SOv71wGi0VAHpICF/uj bvhiNGpLzYg/andsiqBzWbIaRnrvcJUDnipiwlXU4Hq9kDh1eqgyJe1r8bhxKLKhNV2H ACnzd/nVleEk30z735g4l+odD2Y5n0CQIhslDxl9kWDoqxWGrR7brbDPXilBmLirLHxg tURA== MIME-Version: 1.0 Received: by 2002:a17:906:314a:0:0:0:0 with HTTP; Fri, 10 May 2019 13:14:58 -0700 (PDT) In-Reply-To: <9483c3e6-5c54-8c5c-5faf-b0efc08cff1f@suse.cz> References: <5d3bc640-2100-a33f-37c9-0e69a9c74608@suse.cz> <20190506135241.GZ2706@tucnak> <9483c3e6-5c54-8c5c-5faf-b0efc08cff1f@suse.cz> From: Eric Gallager Date: Fri, 10 May 2019 20:15:00 -0000 Message-ID: Subject: Re: [PATCH] Append to target_gtfiles in order to fix Darwin bootstrap. To: =?UTF-8?Q?Martin_Li=C5=A1ka?= Cc: Jakub Jelinek , gcc-patches@gcc.gnu.org, =?UTF-8?Q?Dominique_d=27Humi=C3=A8res?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes X-SW-Source: 2019-05/txt/msg00517.txt.bz2 On 5/6/19, Martin Li=C5=A1ka wrote: > On 5/6/19 3:52 PM, Jakub Jelinek wrote: >> On Mon, May 06, 2019 at 03:47:53PM +0200, Martin Li=C5=A1ka 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=3D"i386-c.o" >>> d_target_objs=3D"i386-d.o" >>> extra_objs=3D"x86-tune-sched.o x86-tune-sched-bd.o x86-tune-sched-ato= m.o >>> x86-tune-sched-core.o i386-options.o i386-builtins.o i386-expand.o >>> i386-features.o" >>> - target_gtfiles=3D"\$(srcdir)/config/i386/i386-builtins.c >>> \$(srcdir)/config/i386/i386-expand.c >>> \$(srcdir)/config/i386/i386-options.c" >>> + target_gtfiles=3D"$target_gtfiles \$(srcdir)/config/i386/i386-builtin= s.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=3D"i386-d.o" >>> extra_options=3D"${extra_options} fused-madd.opt" >>> extra_objs=3D"x86-tune-sched.o x86-tune-sched-bd.o x86-tune-sched-ato= m.o >>> x86-tune-sched-core.o i386-options.o i386-builtins.o i386-expand.o >>> i386-features.o" >>> - target_gtfiles=3D"\$(srcdir)/config/i386/i386-builtins.c >>> \$(srcdir)/config/i386/i386-expand.c >>> \$(srcdir)/config/i386/i386-options.c" >>> + target_gtfiles=3D"$target_gtfiles \$(srcdir)/config/i386/i386-builtin= s.c >>> \$(srcdir)/config/i386/i386-expand.c >>> \$(srcdir)/config/i386/i386-options.c" >>> extra_headers=3D"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=3D"${tm_file} ${cpu_type}/darwin.h" >>> tm_p_file=3D"${tm_p_file} darwin-protos.h" >>> - target_gtfiles=3D"\$(srcdir)/config/darwin.c" >>> + target_gtfiles=3D"$target_gtfiles \$(srcdir)/config/darwin.c" >>> extra_options=3D"${extra_options} darwin.opt" >>> c_target_objs=3D"${c_target_objs} darwin-c.o" >>> cxx_target_objs=3D"${cxx_target_objs} darwin-c.o" >>> >> >> This is insufficient, needs to be done also in the 3 >> target_gtfiles=3D"\$(srcdir)/config/i386/winnt.c" >> cases. > > Done that. I'm going to install the patch. > This reminded me about bug 36994: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D36994 It's about all_gtfiles, but I'm pretty sure that should contain target_gtfiles, so if target_gtfiles is getting longer... well, it seems like bug 36994 would be relevant. > Martin > >> >> Ok with those changes. >> >> Jakub >> > >