From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Bobby Powers <bobbypowers@gmail.com>,
Dirk Gouders <dirk@gouders.net>, Michal Marek <mmarek@suse.cz>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
linux-kbuild@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 4/4] tools lib api: Undefine _FORTIFY_SOURCE before setting it
Date: Thu, 23 Apr 2015 19:03:10 -0300 [thread overview]
Message-ID: <1429826590-32193-5-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1429826590-32193-1-git-send-email-acme@kernel.org>
From: Bobby Powers <bobbypowers@gmail.com>
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 d8fe29fc19a4..8bd960658463 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
--
1.9.3
next prev parent reply other threads:[~2015-04-23 22:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-23 22:03 [GIT PULL 0/4] perf/urgent fixes Arnaldo Carvalho de Melo
2015-04-23 22:03 ` [PATCH 1/4] perf trace: Enable events when doing system wide tracing and starting a workload Arnaldo Carvalho de Melo
2015-04-23 22:03 ` [PATCH 2/4] perf trace: Disable events and drain events when forked workload ends Arnaldo Carvalho de Melo
2015-04-23 22:03 ` [PATCH 3/4] perf kmem: Consistently use PRIu64 for printing u64 values Arnaldo Carvalho de Melo
2015-04-23 22:03 ` Arnaldo Carvalho de Melo [this message]
2015-04-24 2:02 ` [GIT PULL 0/4] perf/urgent fixes Namhyung Kim
2015-04-24 2:09 ` Arnaldo Carvalho de Melo
2015-04-24 8:59 ` Javi Merino
2015-04-24 16:02 ` Arnaldo Carvalho de Melo
2015-04-24 16:05 ` Will Deacon
2015-05-01 10:14 ` [tip:perf/urgent] tools lib traceevent: Fix build failure on 32-bit arch tip-bot for Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429826590-32193-5-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=bobbypowers@gmail.com \
--cc=dirk@gouders.net \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mmarek@suse.cz \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).