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

Commit b42841b7 authored by Michal Marek's avatar Michal Marek
Browse files

kbuild: Get rid of KBUILD_STR 



The compiler can accept -DKBUILD_MODNAME="foo", it's just a matter of
quoting. That way, we reduce the gcc command line a bit.

Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent e0f41e52

scripts/Makefile.lib

+4 −4
Original line number Original line Diff line number Diff line
@@ -96,10 +96,10 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) 
# Note: Files that end up in two or more modules are compiled without the

# Note: Files that end up in two or more modules are compiled without the

#       KBUILD_MODNAME definition. The reason is that any made-up name would

#       KBUILD_MODNAME definition. The reason is that any made-up name would

#       differ in different configs.

#       differ in different configs.

name-fix = $(subst $(comma),_,$(subst -,_,$1))

name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote)

basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"

basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget))

modname_flags  = $(if $(filter 1,$(words $(modname))),\

modname_flags  = $(if $(filter 1,$(words $(modname))),\

                 -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")

                 -DKBUILD_MODNAME=$(call name-fix,$(modname)))





orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \

orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \

                 $(ccflags-y) $(CFLAGS_$(basetarget).o)

                 $(ccflags-y) $(CFLAGS_$(basetarget).o)
@@ -162,7 +162,7 @@ endif 




c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \

c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \

		 $(__c_flags) $(modkern_cflags)                           \

		 $(__c_flags) $(modkern_cflags)                           \

		 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)

		 $(basename_flags) $(modname_flags)





a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \

a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \

		 $(__a_flags) $(modkern_aflags)

		 $(__a_flags) $(modkern_aflags)