Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c4e0602 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Greg Hackmann
Browse files

BACKPORT: kbuild, LLVMLinux: Add -Werror to cc-option to support clang 



Clang will warn about unknown warnings but will not return false
unless -Werror is set. GCC will return false if an unknown
warning is passed.

Adding -Werror make both compiler behave the same.

[arnd: it turns out we need the same patch for testing whether -ffunction-sections
       works right with gcc. I've build tested extensively with this patch
       applied, so let's just merge this one now.]

Upstream commit: c3f0d0bc5b01

Change-Id: I72c97bab5deaa47adef1bc535dcf19b7d2e0dbdf
Signed-off-by: default avatarMark Charlebois <charlebm@gmail.com>
Signed-off-by: default avatarBehan Webster <behanw@converseincode.com>
Reviewed-by: default avatarJan-Simon Mller <dl9pf@gmx.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
parent 4b44c97f

scripts/Kbuild.include

+3 −3
Original line number Diff line number Diff line
@@ -111,12 +111,12 @@ as-instr = $(call try-run,\ 
# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)



cc-option = $(call try-run,\

	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))



# cc-option-yn

# Usage: flag := $(call cc-option-yn,-march=winchip-c6)

cc-option-yn = $(call try-run,\

	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)



# cc-option-align

# Prefix align with either -falign or -malign
@@ -126,7 +126,7 @@ cc-option-align = $(subst -functions=0,,\ 
# cc-disable-warning

# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)

cc-disable-warning = $(call try-run,\

	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))



# cc-name

# Expands to either gcc or clang