From patchwork Sat Nov 10 04:30:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 198171 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]) by ozlabs.org (Postfix) with SMTP id D48402C0087 for ; Sat, 10 Nov 2012 15:31:10 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1353126672; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=qczoXTq bDj+Q+0OmJHCwcNgUYM0=; b=friIVcN1u8aDUE8vS64Fg53+24KnL6lkAZHZOZr B35GgOm1EmpW1RzZERyuX+0HNW6+4xHru9yqkNYYdeIIJppEe+S7tf4n5O1820ZO c2ANC4VJP0F5tg1y9jZSBvvGjvFST+idnWrYfXy6Gjt/sl5J/Zzg/50+NgvOYKqz 6wOs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=WfuJy6dT3HitmvHk+weOZ9ZAKCjxD/ZmBKqHny4iUUbfA7So5pt1g07BF+esWa UjX670umFRgB2B3d10RpJPXSeTl+Eh46U5zfs5VuOnwHnrBM9qXCgpOqBqP2j2WV m7r3Qlhrp522X/ysNl/TZ/xA90BYlFSA+xebe8iEB+Jmg=; Received: (qmail 22893 invoked by alias); 10 Nov 2012 04:31:03 -0000 Received: (qmail 22882 invoked by uid 22791); 10 Nov 2012 04:31:02 -0000 X-SWARE-Spam-Status: No, hits=-4.6 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_XL X-Spam-Check-By: sourceware.org Received: from mail-we0-f175.google.com (HELO mail-we0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 10 Nov 2012 04:30:58 +0000 Received: by mail-we0-f175.google.com with SMTP id t44so2144385wey.20 for ; Fri, 09 Nov 2012 20:30:56 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.90.78 with SMTP id bu14mr5689887wib.21.1352521856504; Fri, 09 Nov 2012 20:30:56 -0800 (PST) Received: by 10.217.64.194 with HTTP; Fri, 9 Nov 2012 20:30:56 -0800 (PST) Date: Fri, 9 Nov 2012 20:30:56 -0800 Message-ID: Subject: [PATCH] Fix combined tree for LTO From: Andrew Pinski To: GCC Patches X-IsSubscribed: yes 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 Hi, The problem here is that set PLUGIN_LD_SUFFIX to ld-new which is not the final installed binary name. This patch fixes the problem by changing if we got ld-new to just ld. Note this issue has been around since 4.6 but not many people test installed binary and it does not show up while doing testing from the combined tree either. OK? Bootstrapped and tested with and without being in a combined tree without any regressions. Thanks, Andrew Pinski * configure.ac: Set PLUGIN_LD_SUFFIX to just "ld" if it was "ld-new". * configure: Regenerate. diff --git a/gcc/configure b/gcc/configure index 55164b6..bce98ad 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21343,6 +21343,11 @@ fi ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld PLUGIN_LD_SUFFIX=`basename $gcc_cv_ld | sed -e "s,$target_alias-,,"` +# if the PLUGIN_LD is set ld-new, just have it as ld +# as that is the installed named. +if test x$PLUGIN_LD_SUFFIX == xld-new; then + PLUGIN_LD_SUFFIX=ld +fi # Check whether --with-plugin-ld was given. if test "${with_plugin_ld+set}" = set; then : diff --git a/gcc/configure.ac b/gcc/configure.ac index fbda2cc..39d8b43 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2003,6 +2003,11 @@ fi]) ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld PLUGIN_LD_SUFFIX=`basename $gcc_cv_ld | sed -e "s,$target_alias-,,"` +# if the PLUGIN_LD is set ld-new, just have it as ld +# as that is the installed named. +if test x$PLUGIN_LD_SUFFIX == xld-new; then + PLUGIN_LD_SUFFIX=ld +fi AC_ARG_WITH(plugin-ld, [AS_HELP_STRING([[--with-plugin-ld=[ARG]]], [specify the plugin linker])], [if test x"$withval" != x; then