ed8af51b6
Jean-Philippe Brucker
2020-04-29
Subject
build system: remove KBUILD_STR()
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Makefile.flags +1 -1scripts/Kbuild.include +1 -0scripts/Makefile.IMA +0 -1scripts/Makefile.lib +4 -4scripts/trylink +0 -3
Makefile.flags+1 -1
| @@ -15,7 +15,7 @@ CPPFLAGS += \ | |
| -include include/autoconf.h \ | |
| -D_GNU_SOURCE -DNDEBUG \ | |
| $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \ | |
| - | -D"BB_VER=KBUILD_STR($(BB_VER))" |
| + | -DBB_VER=$(squote)$(quote)$(BB_VER)$(quote)$(squote) |
| CFLAGS += $(call cc-option,-Wall,) | |
| CFLAGS += $(call cc-option,-Wshadow,) | |
scripts/Kbuild.include+1 -0
| @@ -4,6 +4,7 @@ | |
| # Convinient variables | |
| comma := , | |
| squote := ' | |
| + | quote := " |
| empty := | |
| space := $(empty) $(empty) | |
scripts/Makefile.IMA+0 -1
| @@ -49,7 +49,6 @@ OBJCOPY = $(CROSS_COMPILE)objcopy | |
| OBJDUMP = $(CROSS_COMPILE)objdump | |
| CFLAGS := $(CFLAGS) | |
| - | CPPFLAGS += -D"KBUILD_STR(s)=\#s" #-Q |
| # We need some generic definitions | |
| include $(srctree)/scripts/Kbuild.include | |
scripts/Makefile.lib+4 -4
| @@ -81,10 +81,10 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) | |
| # Note: It's possible that one object gets potentially linked into more | |
| # than one module. In that case KBUILD_MODNAME will be set to foo_bar, | |
| # where foo and bar are the name of the modules. | |
| - | name-fix = $(subst $(comma),_,$(subst -,_,$1)) |
| - | basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))" |
| + | name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote) |
| + | basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(*F)) |
| modname_flags = $(if $(filter 1,$(words $(modname))),\ | |
| - | -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") |
| + | -DKBUILD_MODNAME=$(call name-fix,$(modname))) |
| _c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) | |
| _a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) | |
| @@ -110,7 +110,7 @@ endif | |
| c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ | |
| $(__c_flags) $(modkern_cflags) \ | |
| - | -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) |
| + | $(basename_flags) $(modname_flags) |
| a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ | |
| $(__a_flags) $(modkern_aflags) | |
scripts/trylink+0 -3
| @@ -50,9 +50,6 @@ check_cc() { | |
| echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c | |
| # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :( | |
| # Was using "-xc /dev/null", but we need a valid C program. | |
| - | # "eval" may be needed if CFLAGS can contain |
| - | # '... -D"BB_VER=KBUILD_STR(1.N.M)" ...' |
| - | # and we need shell to process quotes! |
| $CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1 | |
| exitcode=$? | |
| rm -f "$tempname" "$tempname".c "$tempname".o | |