From patchwork Mon Mar 7 11:35:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Lissy X-Patchwork-Id: 85729 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 595C0B70DC for ; Mon, 7 Mar 2011 22:35:43 +1100 (EST) Received: (qmail 19521 invoked by alias); 7 Mar 2011 11:35:40 -0000 Received: (qmail 19421 invoked by uid 22791); 7 Mar 2011 11:35:40 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from hermes.univ-tours.fr (HELO hermes.univ-tours.fr) (193.52.209.50) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 07 Mar 2011 11:35:36 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgcGACtSdE0KwQUB/2dsb2JhbACYTI5xvgOFYgSQDQ Received: from unknown (HELO proxy10.zimbra.univ-tours.local) ([10.193.5.1]) by hermes2.univ-tours.fr with ESMTP; 07 Mar 2011 12:35:26 +0100 Received: from localhost (localhost [127.0.0.1]) by proxy10.zimbra.univ-tours.local (Postfix) with ESMTP id F223920035; Mon, 7 Mar 2011 12:35:26 +0100 (CET) Received: from proxy10.zimbra.univ-tours.local ([127.0.0.1]) by localhost (proxy10.zimbra.univ-tours.local [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HzwZcAYsan9B; Mon, 7 Mar 2011 12:35:26 +0100 (CET) Received: from portable-alex.polytech.univ-tours.local (portable-alex.polytech.univ-tours.local [10.108.5.42]) by proxy10.zimbra.univ-tours.local (Postfix) with ESMTP id 805AC20078; Mon, 7 Mar 2011 12:35:26 +0100 (CET) From: Alexandre Lissy To: gcc-patches@gcc.gnu.org Cc: Alexandre Lissy Subject: [PATCH 1/4] Fix RPM compilation Date: Mon, 7 Mar 2011 12:35:21 +0100 Message-Id: <1299497724-3972-2-git-send-email-alissy@mandriva.com> In-Reply-To: <1299497724-3972-1-git-send-email-alissy@mandriva.com> References: <20110301223047.2ae3a8f0.basile@starynkevitch.net> <1299497724-3972-1-git-send-email-alissy@mandriva.com> 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 The GCC's options -pipe and -Wp,-D_FORTIFY_SOURCE=2 are passed by default by Mandriva's GCC RPM spec file, and end up in some parts of MELT CFLAGS. But they should not end up there. --- gcc/Makefile.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 3f1ffa0..f841776 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -5341,6 +5341,7 @@ MELT_RAW_CFLAGS= \ ## since the generated routines are no more huge (since the ## initialization code is split in several chunks).. Likewise, avoid ## passing -gtoggle and -g +## Also remove -pipe and -Wp,-D_FORTIFY_SOURCE=2 MELTHERE_CFLAGS= $(filter-out -g, $(filter-out -gtoggle, $(MELT_RAW_CFLAGS))) export MELTHERE_CFLAGS @@ -5430,7 +5431,10 @@ melt_make_source_dir=$(srcdir)/melt melt_make_module_dir=$(objdir) melt_make_move=$(SHELL) $(srcdir)/../move-if-change ## Don't use := definitions here! -melt_make_cc1flags= -I. $(MELTHERE_CFLAGS) -I $(melt_build_include_dir) +## CC1 forbids -pipe and -Wp,-D_FORTIFY_SOURCE=2 +comma= , +MELTHERE_CC1_CFLAGS=$(filter-out -pipe -Wp$(comma)-D_FORTIFY_SOURCE=2, $(MELTHERE_CFLAGS)) +melt_make_cc1flags= -I. $(MELTHERE_CC1_CFLAGS) -I $(melt_build_include_dir) melt_cflags= -I. $(MELTHERE_CFLAGS) -I $(melt_build_include_dir) export melt_cflags ## extra cflags are for compiling applicative MELT files, e.g. xtramelt*.c