Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753849AbbEAKPU (ORCPT <rfc822;w@1wt.eu>);
	Fri, 1 May 2015 06:15:20 -0400
Received: from terminus.zytor.com ([198.137.202.10]:52015 "EHLO
	terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753789AbbEAKPN (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 1 May 2015 06:15:13 -0400
Date: Fri, 1 May 2015 03:14:07 -0700
From: tip-bot for Bobby Powers <tipbot@zytor.com>
Message-ID: <tip-de28c15daf60e9625bece22f13a091fac8d05f1d@git.kernel.org>
Cc: hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, bobbypowers@gmail.com,
        linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, dirk@gouders.net,
        paulus@samba.org, mmarek@suse.cz, acme@redhat.com, jolsa@kernel.org
Reply-To: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, mmarek@suse.cz,
        dirk@gouders.net, paulus@samba.org, a.p.zijlstra@chello.nl,
        linux-kernel@vger.kernel.org, bobbypowers@gmail.com, acme@redhat.com,
        jolsa@kernel.org
In-Reply-To: <1429658381-3039-1-git-send-email-bobbypowers@gmail.com>
References: <1429658381-3039-1-git-send-email-bobbypowers@gmail.com>
To: linux-tip-commits@vger.kernel.org
Subject: [tip:perf/urgent] tools lib api:
  Undefine _FORTIFY_SOURCE before setting it
Git-Commit-ID: de28c15daf60e9625bece22f13a091fac8d05f1d
X-Mailer: tip-git-log-daemon
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org>
  to get blacklisted from these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2131
Lines: 52

Commit-ID:  de28c15daf60e9625bece22f13a091fac8d05f1d
Gitweb:     http://git.kernel.org/tip/de28c15daf60e9625bece22f13a091fac8d05f1d
Author:     Bobby Powers <bobbypowers@gmail.com>
AuthorDate: Tue, 21 Apr 2015 19:19:41 -0400
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 23 Apr 2015 17:08:23 -0300

tools lib api: Undefine _FORTIFY_SOURCE before setting it

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.

v2 applies cleanly on top of already pulled kbuild changes for 4.1-rc1.

Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Dirk Gouders <dirk@gouders.net>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-kbuild@vger.kernel.org
Link: http://lkml.kernel.org/r/1429658381-3039-1-git-send-email-bobbypowers@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 d8fe29f..8bd9606 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -16,7 +16,7 @@ MAKEFLAGS += --no-print-directory
 LIBFILE = $(OUTPUT)libapi.a
 
 CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
-CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 -fPIC
+CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
 CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
 RM = rm -f
--
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/