Skip to contentSkip to conversation

tools/lib/api: undefine _FORTIFY_SOURCE before setting it

PATCH New Bobby Powers 2 participants 2 messages Apr 21, 2015 – May 1, 2015 Kbuild

lore
Share & tools
lore

Bobby Powers

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
Acked-by Jiri Olsa <[email protected]>
---
 tools/lib/api/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/api/Makefile +1 -1
index d8fe29f..8bd9606 100644
@@ -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
Signature · 1 line
2.3.5
merge bot
#1 lore raw

[tip:perf/urgent] tools lib api: Undefine _FORTIFY_SOURCE before setting it

tools lib api: Undefine _FORTIFY_SOURCE before setting it
Commit-ID:  de28c15daf60e9625bece22f13a091fac8d05f1d
Gitweb:     http://git.kernel.org/tip/de28c15daf60e9625bece22f13a091fac8d05f1d
Author:     Bobby Powers <[email protected]>
AuthorDate: Tue, 21 Apr 2015 19:19:41 -0400
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>
Acked-by Jiri Olsa <[email protected]>
Cc Dirk Gouders <[email protected]>
Cc Michal Marek <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc [email protected]
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/lib/api/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/api/Makefile +1 -1
index d8fe29f..8bd9606 100644
@@ -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