Skip to content

Commit 8811071

Browse files
committed
kbuild: hardcode genksyms path and remove GENKSYMS variable
The genksyms source was integrated into the kernel tree in 2003. I do not expect anybody still using the external /sbin/genksyms. Kbuild does not need to provide the ability to override GENKSYMS. Let's remove the GENKSYMS variable, and use the hardcoded path. Since it occurred in the pre-git era, I attached the commit message in case somebody is interested in the historical background. | Author: Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | Date: Wed Feb 19 04:17:28 2003 -0600 | | kbuild: [PATCH] put genksyms in scripts dir | | This puts genksyms into scripts/genksyms/. | | genksyms used to be maintained externally, though the only possible user | was the kernel build. Moving it into the kernel sources makes it easier to | keep it uptodate, like for example updating it to generate linker scripts | directly instead of postprocessing the generated header file fragments | with sed, as we do currently. | | Also, genksyms does not handle __typeof__, which needs to be fixed since | some of the exported symbol in the kernel are defined using __typeof__. | | (Rusty Russell/me) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
1 parent b513adf commit 8811071

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ OBJDUMP = $(CROSS_COMPILE)objdump
390390
LEX = flex
391391
YACC = bison
392392
AWK = awk
393-
GENKSYMS = scripts/genksyms/genksyms
394393
INSTALLKERNEL := installkernel
395394
DEPMOD = /sbin/depmod
396395
PERL = perl
@@ -443,7 +442,7 @@ GCC_PLUGINS_CFLAGS :=
443442

444443
export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
445444
export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
446-
export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
445+
export MAKE LEX YACC AWK INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
447446
export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
448447

449448
export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS

scripts/Makefile.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ $(obj)/%.i: $(src)/%.c FORCE
120120
# These mirror gensymtypes_S and co below, keep them in synch.
121121
cmd_gensymtypes_c = \
122122
$(CPP) -D__GENKSYMS__ $(c_flags) $< | \
123-
$(GENKSYMS) $(if $(1), -T $(2)) \
123+
scripts/genksyms/genksyms $(if $(1), -T $(2)) \
124124
$(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \
125125
$(if $(KBUILD_PRESERVE),-p) \
126126
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
@@ -320,7 +320,7 @@ cmd_gensymtypes_S = \
320320
grep "\<___EXPORT_SYMBOL\>" | \
321321
sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ; } | \
322322
$(CPP) -D__GENKSYMS__ $(c_flags) -xc - | \
323-
$(GENKSYMS) $(if $(1), -T $(2)) \
323+
scripts/genksyms/genksyms $(if $(1), -T $(2)) \
324324
$(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \
325325
$(if $(KBUILD_PRESERVE),-p) \
326326
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))

0 commit comments

Comments
 (0)