From patchwork Tue Jun 21 14:28:09 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
X-Patchwork-Id: 101293
Return-Path: 
 <gcc-patches-return-294915-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 9C0D0B6F59
	for <incoming@patchwork.ozlabs.org>;
	Wed, 22 Jun 2011 00:28:30 +1000 (EST)
Received: (qmail 23024 invoked by alias); 21 Jun 2011 14:28:28 -0000
Received: (qmail 23015 invoked by uid 22791); 21 Jun 2011 14:28:27 -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 snape.CeBiTec.Uni-Bielefeld.DE (HELO
	smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Tue, 21 Jun 2011 14:28:12 +0000
Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1])	by
	smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id
	8B4D2593; Tue, 21 Jun 2011 16:28:11 +0200 (CEST)
Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1])	by
	localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1])
	(amavisd-new, port 10024)	with LMTP id qhlxlK9Qs07Q;
	Tue, 21 Jun 2011 16:28:10 +0200 (CEST)
Received: from manam.CeBiTec.Uni-Bielefeld.DE
	(manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120])	(using
	TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))	(No
	client certificate requested)	by
	smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id
	31120592; Tue, 21 Jun 2011 16:28:10 +0200 (CEST)
Received: (from ro@localhost)	by manam.CeBiTec.Uni-Bielefeld.DE
	(8.14.4+Sun/8.14.4/Submit) id p5LES9g7019334;
	Tue, 21 Jun 2011 16:28:09 +0200 (MEST)
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
To: Paolo Bonzini <bonzini@gnu.org>
Cc: gcc-patches@gcc.gnu.org, Ralf Wildenhues <Ralf.Wildenhues@gmx.de>,
	Ian Lance Taylor <iant@google.com>
Subject: Re: Unreviewed libgcc build patch
References: <yddaadcrcgd.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
	<BANLkTin+gYodAUbh4R+=6mmYBE1RAb09mw@mail.gmail.com>
Date: Tue, 21 Jun 2011 16:28:09 +0200
In-Reply-To: <BANLkTin+gYodAUbh4R+=6mmYBE1RAb09mw@mail.gmail.com>
	(Paolo	Bonzini's message of "Tue, 21 Jun 2011 16:12:05 +0200")
Message-ID: <yddhb7ji7ie.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v)
MIME-Version: 1.0
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Paolo Bonzini <bonzini@gnu.org> writes:

> Ok without the commented info evaluation, and with the per-target
> macro renamed to c_flags-$<.

Here's what I've installed after rebuilding libgcc and verifying that
-fexceptions still isn't applied to enable-execute-stack.c.

Thanks.
        Rainer


2011-06-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* shared-object.mk (c_flags-$o): Save c_flags.
	($(base)$(objext)): Use it.
	($(base)_s$(objext)): Likewise.

Index: libgcc/shared-object.mk
===================================================================
--- libgcc/shared-object.mk	(revision 175260)
+++ libgcc/shared-object.mk	(working copy)
@@ -6,13 +6,15 @@
 
 base := $(basename $(notdir $o))
 
+c_flags-$o := $(c_flags)
+
 ifeq ($(suffix $o),.c)
 
 $(base)$(objext): $o
-	$(gcc_compile) $(c_flags) -c $< $(vis_hide)
+	$(gcc_compile) $(c_flags-$<) -c $< $(vis_hide)
 
 $(base)_s$(objext): $o
-	$(gcc_s_compile) $(c_flags) -c $<
+	$(gcc_s_compile) $(c_flags-$<) -c $<
 
 else