Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753470AbbDRPF5 (ORCPT <rfc822;w@1wt.eu>);
	Sat, 18 Apr 2015 11:05:57 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42922 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753183AbbDRPF4 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sat, 18 Apr 2015 11:05:56 -0400
Date: Sat, 18 Apr 2015 17:05:41 +0200
From: Jiri Olsa <jolsa@redhat.com>
To: Bobby Powers <bobbypowers@gmail.com>
Cc: linux-kernel@vger.kernel.org, Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>
Subject: Re: [PATCH] tools/lib/api: undefine _FORTIFY_SOURCE before setting it
Message-ID: <20150418150541.GA15063@krava.brq.redhat.com>
References: <1429368380-6681-1-git-send-email-bobbypowers@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1429368380-6681-1-git-send-email-bobbypowers@gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1589
Lines: 43

On Sat, Apr 18, 2015 at 10:46:20AM -0400, Bobby Powers wrote:
> Some toolchains (like Hardened Gentoo) define _FORTIFY_SOURCE in the
> built-in, default args.  This causes perf builds to fail with:
> 
> <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
> <built-in>: note: this is the location of the previous definition
> cc1: all warnings being treated as errors
> 
> To avoid this, undefine _FORTIFY_SOURCE before (possibly
> re-)defining it in tools/lib/api.
> 
> Signed-off-by: Bobby Powers <bobbypowers@gmail.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

> ---
>  tools/lib/api/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
> index 36c08b1..87c72d1 100644
> --- a/tools/lib/api/Makefile
> +++ b/tools/lib/api/Makefile
> @@ -21,7 +21,7 @@ LIB_OBJS += $(OUTPUT)fd/array.o
>  
>  LIBFILE = libapikfs.a
>  
> -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
> +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
>  EXTLIBS = -lelf -lpthread -lrt -lm
>  ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>  ALL_LDFLAGS = $(LDFLAGS)
> -- 
> 2.3.5
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/