Commit 22079ee4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v4.15' of... 

Merge tag 'kbuild-fixes-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix cross-compilation for architectures that setup CROSS_COMPILE in
   their arch Makefile

 - fix Kconfig rational operators for bool / tristate

 - drop a gperf-generated file from .gitignore

* tag 'kbuild-fixes-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  genksyms: drop *.hash.c from .gitignore
  kconfig: fix relational operators for bool and tristate symbols
  kbuild: move cc-option and cc-disable-warning after incl. arch Makefile
parents 852b0a89 36c16816

Documentation/kbuild/kconfig-language.txt

+15 −8
Original line number Diff line number Diff line
@@ -200,10 +200,14 @@ module state. Dependency expressions have the following syntax: 
<expr> ::= <symbol>                             (1)

           <symbol> '=' <symbol>                (2)

           <symbol> '!=' <symbol>               (3)

           '(' <expr> ')'                       (4)

           '!' <expr>                           (5)

           <expr> '&&' <expr>                   (6)

           <expr> '||' <expr>                   (7)

           <symbol1> '<' <symbol2>              (4)

           <symbol1> '>' <symbol2>              (4)

           <symbol1> '<=' <symbol2>             (4)

           <symbol1> '>=' <symbol2>             (4)

           '(' <expr> ')'                       (5)

           '!' <expr>                           (6)

           <expr> '&&' <expr>                   (7)

           <expr> '||' <expr>                   (8)



Expressions are listed in decreasing order of precedence.
@@ -214,10 +218,13 @@ Expressions are listed in decreasing order of precedence. 
    otherwise 'n'.

(3) If the values of both symbols are equal, it returns 'n',

    otherwise 'y'.

(4) Returns the value of the expression. Used to override precedence.

(5) Returns the result of (2-/expr/).

(6) Returns the result of min(/expr/, /expr/).

(7) Returns the result of max(/expr/, /expr/).

(4) If value of <symbol1> is respectively lower, greater, lower-or-equal,

    or greater-or-equal than value of <symbol2>, it returns 'y',

    otherwise 'n'.

(5) Returns the value of the expression. Used to override precedence.

(6) Returns the result of (2-/expr/).

(7) Returns the result of min(/expr/, /expr/).

(8) Returns the result of max(/expr/, /expr/).



An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2

respectively for calculations). A menu entry becomes visible when its

Makefile

+23 −20
Original line number Diff line number Diff line
@@ -484,26 +484,6 @@ CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN) 
endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

endif



ifeq ($(config-targets),1)
@@ -716,6 +696,29 @@ ifdef CONFIG_CC_STACKPROTECTOR 
endif

KBUILD_CFLAGS += $(stackp-flag)



ifeq ($(cc-name),clang)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

endif



ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

else

scripts/genksyms/.gitignore

+0 −1
Original line number Diff line number Diff line 
*.hash.c

*.lex.c

*.tab.c

*.tab.h

scripts/kconfig/expr.c

+4 −1
Original line number Diff line number Diff line
@@ -893,7 +893,10 @@ static enum string_value_kind expr_parse_string(const char *str, 
	switch (type) {

	case S_BOOLEAN:

	case S_TRISTATE:

		return k_string;

		val->s = !strcmp(str, "n") ? 0 :

			 !strcmp(str, "m") ? 1 :

			 !strcmp(str, "y") ? 2 : -1;

		return k_signed;

	case S_INT:

		val->s = strtoll(str, &tail, 10);

		kind = k_signed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE