From patchwork Thu Mar 20 17:40:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schmidt X-Patchwork-Id: 332338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E12E32C00E8 for ; Fri, 21 Mar 2014 04:42:41 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=D0aci8WlGSx0nY231 5m2gDO1/3dFr15luDctAhJS0vv2NRPvYErEOoUvPe+tOKbR/09Yj2e8NfGhefRVK 7qcWkuc8QaecfAtNV4R8HxJegJ/xYcU6cJAQRxCLpCCaHDQwMAbr/YfcpofpvMOz FiVCGJgJa86cj6xYJHUYx5btro= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=g3mzdJP0SlYQWxRzjGNN6go Skls=; b=jQAuCnPa7joegQy8NMt3XSa6ZumdgRJ1ICVqJcCFq61/EoFGfaUEkIT Qa5YQdVldj/1FHLNK4T3xAfoo58FJMGoH/0MTIBIOZ/kxZb1QF4nhGbIu71tCAsF IO4P/HW9pRZ79/pom1m8sqtX3Y+zlodZHketdYOCHB4PsYqPSpMA= Received: (qmail 15537 invoked by alias); 20 Mar 2014 17:42:34 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 15527 invoked by uid 89); 20 Mar 2014 17:42:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL, BAYES_50 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 20 Mar 2014 17:42:32 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1WQgz7-0003Aj-8o from Bernd_Schmidt@mentor.com ; Thu, 20 Mar 2014 10:42:29 -0700 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 20 Mar 2014 10:42:28 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.2.247.3; Thu, 20 Mar 2014 17:42:26 +0000 Message-ID: <532B2809.7040600@codesourcery.com> Date: Thu, 20 Mar 2014 18:40:25 +0100 From: Bernd Schmidt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: GCC Patches CC: Ilya Verbin Subject: Re: [gomp4/stage1] Utility functions for collect2/lto-wrapper/mkoffload 2/2 References: <532B1F72.5020704@codesourcery.com> In-Reply-To: <532B1F72.5020704@codesourcery.com> On 03/20/2014 06:03 PM, Bernd Schmidt wrote: > This is the second part of making a set of utility functions to be used > by collect2, lto-wrapper and mkoffload. > > The implementations of some functions like fork_execute are changed to > those from collect2 and the calls in lto-wrapper adapted accordingly. > There are some minor changes in these functions: for example I avoid > calling fatal_error, instead using the fatal/fatal_perror functions so > that the cleanup routine is called properly (lto-wrapper does not use > atexit as collect2 does). > > Committed on gomp-4_0-branch; ok for stage1? This was missing Makefile.in from the commit. Now fixed. Bernd Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in (revision 208724) +++ gcc/Makefile.in (working copy) @@ -1904,7 +1904,8 @@ gcc-ranlib.c: gcc-ar.c gcc-nm.c: gcc-ar.c cp $^ $@ -COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o file-find.o +COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \ + collect-utils.o file-find.o COLLECT2_LIBS = @COLLECT2_LIBS@ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) # Don't try modifying collect2 (aka ld) in place--it might be linking this. @@ -1915,11 +1916,10 @@ collect2$(exeext): $(COLLECT2_OBJS) $(LI CFLAGS-collect2.o += -DTARGET_MACHINE=\"$(target_noncanonical)\" \ @TARGET_SYSTEM_ROOT_DEFINE@ -lto-wrapper$(exeext): lto-wrapper.o collect-utils.o ggc-none.o \ - libcommon-target.a $(LIBDEPS) +LTO_WRAPPER_OBJS = lto-wrapper.o collect-utils.o ggc-none.o +lto-wrapper$(exeext): $(LTO_WRAPPER_OBJS) libcommon-target.a $(LIBDEPS) +$(LINKER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o T$@ \ - lto-wrapper.o collect-utils.o ggc-none.o libcommon-target.a \ - $(LIBS) + $(LTO_WRAPPER_OBJS) libcommon-target.a $(LIBS) mv -f T$@ $@ # Files used by all variants of C or by the stand-alone pre-processor.