From patchwork Thu Jun 10 13:59:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 55222 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 87A981007D2 for ; Thu, 10 Jun 2010 23:59:44 +1000 (EST) Received: (qmail 4520 invoked by alias); 10 Jun 2010 13:59:41 -0000 Received: (qmail 4509 invoked by uid 22791); 10 Jun 2010 13:59:40 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from vpn.id2.novell.com (HELO vpn.id2.novell.com) (195.33.99.129) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 10 Jun 2010 13:59:34 +0000 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Thu, 10 Jun 2010 16:52:19 +0100 Message-Id: <4C110BE60200007800005FB4@vpn.id2.novell.com> Date: Thu, 10 Jun 2010 14:59:34 +0100 From: "Jan Beulich" To: Subject: [PATCH] fix LIBUNWIND_LINK specification in libgcc.mvars Mime-Version: 1.0 Content-Disposition: inline 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 Just like for SHLIB_LINK, $(GCC_FOR_TARGET) should be protected from being expanded to early - my cross builds for ia64 failed without this change. As this used to work with 4.4.x and earlier, I'm at once asking to also apply this to the 4.5 branch. gcc/ 2010-06-10 Jan Beulich * Makefile.in (libgcc.mvars): Retain GCC_FOR_TARGET for SHLIBUNWIND_LINK. --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1866,7 +1866,7 @@ libgcc.mvars: config.status Makefile $(L echo LIB2ADDEHSHARED = '$(call srcdirify,$(LIB2ADDEHSHARED) $(srcdir)/emutls.c)' >> tmp-libgcc.mvars echo LIB2_SIDITI_CONV_FUNCS = '$(LIB2_SIDITI_CONV_FUNCS)' >> tmp-libgcc.mvars echo LIBUNWIND = '$(call srcdirify,$(LIBUNWIND))' >> tmp-libgcc.mvars - echo SHLIBUNWIND_LINK = '$(SHLIBUNWIND_LINK)' >> tmp-libgcc.mvars + echo SHLIBUNWIND_LINK = '$(subst $(GCC_FOR_TARGET),$$(GCC_FOR_TARGET),$(SHLIBUNWIND_LINK))' >> tmp-libgcc.mvars echo SHLIBUNWIND_INSTALL = '$(SHLIBUNWIND_INSTALL)' >> tmp-libgcc.mvars echo FPBIT = '$(FPBIT)' >> tmp-libgcc.mvars echo FPBIT_FUNCS = '$(FPBIT_FUNCS)' >> tmp-libgcc.mvars