Commit 9f3f1fd2 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Masahiro Yamada
Browse files

kbuild: Add __cc-option macro 



cc-option uses KBUILD_CFLAGS and KBUILD_CPPFLAGS when it determines
whether an option is supported or not. This is fine for options used to
build the kernel itself, however some components like the x86 boot code
use a different set of flags.

Add the new macro __cc-option which is a more generic version of
cc-option with additional parameters. One parameter is the compiler
with which the check should be performed, the other the compiler options
to be used instead KBUILD_C*FLAGS.

Refactor cc-option and hostcc-option to use __cc-option and move
hostcc-option to scripts/Kbuild.include.

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Suggested-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMichal Marek <mmarek@suse.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 39a33ff8

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 


HOSTCC       = gcc

HOSTCXX      = g++

HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89

HOSTCFLAGS   := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89

HOSTCXXFLAGS = -O2



ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)

scripts/Kbuild.include

+12 −2
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ as-option = $(call try-run,\ 
as-instr = $(call try-run,\

	printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))



# __cc-option

# Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586)

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

	$(1) -Werror $(2) $(3) -c -x c /dev/null -o "$$TMP",$(3),$(4))



# Do not attempt to build with gcc plugins during cc-option tests.

# (And this uses delayed resolution so the flags will be up to date.)

CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
@@ -115,8 +120,13 @@ CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS)) 
# cc-option

# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)



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

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

cc-option = $(call __cc-option, $(CC),\

	$(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS),$(1),$(2))



# hostcc-option

# Usage: cflags-y += $(call hostcc-option,-march=winchip-c6,-march=i586)

hostcc-option = $(call __cc-option, $(HOSTCC),\

	$(HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2))



# cc-option-yn

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

scripts/Makefile.host

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
# Will compile qconf as a C++ program, and menu as a C program.

# They are linked as C++ code to the executable qconf



# hostcc-option

# Usage: cflags-y += $(call hostcc-option,-march=winchip-c6,-march=i586)



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

	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))



__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))

host-cshlib := $(sort $(hostlibs-y) $(hostlibs-m))

host-cxxshlib := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))

CRA Git | Maintained and supported by SUSTech CRA and CCSE