powerpc: build modules outside the kernel tree fails, if it was built using O=
Subsystems (3)
PATCH 1/1 powerpc: build modules outside the kernel tree fails, if it was built using O=
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.
Fix linking modules against crtsavres.o
Previously we got
CC drivers/char/hw_random/rng-core.mod.o
LD [M] drivers/char/hw_random/rng-core.ko
/there/src/buildroot.git.ppc/build_powerpc_nofpu/staging_dir/usr/bin/powerpc-linux-uclibc-ld: arch/powerpc/lib/crtsavres.o: No such file: No such file or directory
* Makefile (LDFLAGS_MODULE_PREREQ): New variable to hold prerequisite files for modules.
* arch/powerpc/Makefile: add crtsavres.o to LDFLAGS_MODULE_PREREQ.
* scripts/Makefile.modpost (cmd_as_o_S): Copy from Makefile.build. (cmd_ld_ko_o): Also link LDFLAGS_MODULE_PREREQ.
Provide rule to build objects from assembler.
Signed-off by: Yuri Frolov <[email protected]>
Makefile | 2 ++ arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)
arch/powerpc/Makefile +1 -1
@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o endif ifeq ($(CONFIG_TUNE_CELL),y)
Makefile +2 -0
@@ -326,6 +326,7 @@ MODFLAGS = -DMODULE CFLAGS_MODULE = $(MODFLAGS) AFLAGS_MODULE = $(MODFLAGS) LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds +LDFLAGS_MODULE_PREREQ = CFLAGS_KERNEL = AFLAGS_KERNEL = CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
@@ -355,6 +356,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
scripts/Makefile.modpost +10 -2
@@ -122,14 +122,22 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< + +$(LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S) + +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(LDFLAGS_MODULE_PREREQ) FORCE $(call if_changed_dep,cc_o_c) targets += $(modules:.ko=.mod.o) # Step 6), final link of the modules quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \ + cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE_PREREQ) \ + $(LDFLAGS_MODULE) -o $@ \ $(filter-out FORCE,$^) $(modules): %.ko :%.o %.mod.o FORCE
Quoted 8 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Fix linking modules against crtsavres.o
Hi !
This is the same patch you already posted as "
[PATCH] Fix linking modules against
crtsavres.o
"
Or it's an update ?
I've asked Sam to review it already since it affects the main kernel makefiles, waiting for his answer.
Cheers,
Ben.
Quoted 83 lines
Previously we got
CCdrivers/char/hw_random/rng-core.mod.o
LD [M]drivers/char/hw_random/rng-core.ko
/there/src/buildroot.git.ppc/build_powerpc_nofpu/staging_dir/usr/bin/powerpc-linux-uclibc-ld:arch/powerpc/lib/crtsavres.o: No such file: No such file or directory*
Makefile(LDFLAGS_MODULE_PREREQ): New variable to hold prerequisite files for modules.
*arch/powerpc/Makefile: add crtsavres.o toLDFLAGS_MODULE_PREREQ.
*scripts/Makefile.modpost(cmd_as_o_S): Copy from Makefile.build. (cmd_ld_ko_o): Also linkLDFLAGS_MODULE_PREREQ.
Provide rule to build objects from assembler.Signed-off-by Bernhard Reutner-Fischer <[email protected]>Signed-off by: Yuri Frolov <[email protected]>
Makefile | 2 ++ arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/arch/powerpc/Makefile linux-2.6-powerpc-crtsavres/arch/powerpc/Makefile
arch/powerpc/Makefile +1
-1@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o endif ifeq ($(CONFIG_TUNE_CELL),y)diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/Makefile linux-2.6-powerpc-crtsavres/Makefile
Makefile +2
-0@@ -326,6 +326,7 @@ MODFLAGS = -DMODULE CFLAGS_MODULE = $(MODFLAGS) AFLAGS_MODULE = $(MODFLAGS) LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds +LDFLAGS_MODULE_PREREQ = CFLAGS_KERNEL = AFLAGS_KERNEL = CFLAGS_GCOV = -fprofile-arcs -ftest-coverage@@ -355,6 +356,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOVdiff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/scripts/Makefile.modpost linux-2.6-powerpc-crtsavres/scripts/Makefile.modpost
scripts/Makefile.modpost +10
-2@@ -122,14 +122,22 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< + +$(LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S) + +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(LDFLAGS_MODULE_PREREQ) FORCE $(call if_changed_dep,cc_o_c) targets += $(modules:.ko=.mod.o) # Step 6), final link of the modules quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \ + cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE_PREREQ) \ + $(LDFLAGS_MODULE) -o $@ \ $(filter-out FORCE,$^) $(modules): %.ko :%.o %.mod.o FORCE_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
Quoted 15 lines · Benjamin Herrenschmidt
Quoted 8 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Fix linking modules against crtsavres.o
Hi !
This is the same patch you already posted as "
Quoted 8 lines
[PATCH] Fix linking modules against
crtsavres.o
"Or it's an update ?
I've asked Sam to review it already since it affects the main kernel makefiles, waiting for his answer.
Saw the duplicates. Will get back to it tonight (morning here now).
Sam
Quoted 12 lines · Sam Ravnborg
Quoted 11 lines · Benjamin Herrenschmidt
Quoted 8 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Fix linking modules against crtsavres.o
Hi !
Quoted 8 lines
Quoted 8 lines
This is the same patch you already posted as "
[PATCH] Fix linking modules against
crtsavres.o
"Or it's an update ?
It's the same, sorry for not mentioning it. The previous letter contains attachment crap, so I sent the letter with patch in-lined.
Quoted 6 lines
Quoted 3 lines
I've asked Sam to review it already since it affects the main kernel makefiles, waiting for his answer.
Saw the duplicates. Will get back to it tonight (morning here now).
Sam
Ok, thank you.
Quoted 5 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.
Hi Yuri.
I like the way you do the extra link in Makefile.modpost. But you need to redo some parts as per comments below.
Quoted 3 lines
Fix linking modules against crtsavres.o
Please elaborate more on what this commit does.
Quoted 5 lines
Previously we got
CCdrivers/char/hw_random/rng-core.mod.o
LD [M]drivers/char/hw_random/rng-core.ko
/there/src/buildroot.git.ppc/build_powerpc_nofpu/staging_dir/usr/bin/powerpc-linux-uclibc-ld:arch/powerpc/lib/crtsavres.o: No such file: No such file or directory
Always good to include error messages.
Quoted 6 lines
*
Makefile(LDFLAGS_MODULE_PREREQ): New variable to hold prerequisite files for modules.
*arch/powerpc/Makefile: add crtsavres.o toLDFLAGS_MODULE_PREREQ.
*scripts/Makefile.modpost(cmd_as_o_S): Copy from Makefile.build. (cmd_ld_ko_o): Also linkLDFLAGS_MODULE_PREREQ.
Provide rule to build objects from assembler.
But this GNUism can go - we do not use it in the kernel.
Quoted 13 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>Signed-off by: Yuri Frolov <[email protected]>
Makefile | 2 ++ arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/arch/powerpc/Makefile linux-2.6-powerpc-crtsavres/arch/powerpc/Makefile
arch/powerpc/Makefile else · line 97
Quoted 6 lines
arch/powerpc/Makefile +1
-1@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o endif
The naming sucks.
How about:
KBUILD_MODULE_LINK_SOURCE
This would tell the reader that this is source to be linked on a module.
And this is an arch specific thing so no need to preset it in top-level Makefile.
But it is mandatory to include a description in Documentation/kbuild/kbuild.txt
scripts/Makefile.modpost quiet_cmd_cc_o_c = CC $@ · line 126
Quoted 9 lines
scripts/Makefile.modpost +2
-1@@ -122,14 +122,22 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $<
Align this so cmd_as_o_S is under each other - as we do for cmd_cc_o_c
scripts/Makefile.modpost quiet_cmd_cc_o_c = CC $@ · line 130
Quoted 4 lines
scripts/Makefile.modpost +4
-0+ +$(LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S)
Good catch with the mkdir - needed for O= builds.
I think we shall wrap this in
ifdef KBUILD_MODULE_LINK_SOURCE
...
endif
So we do not have an empty rule when it is not defined.
Please fix up these things and resubmit.
Thanks,
Sam
Quoted 9 lines · Sam Ravnborg
Quoted 5 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Hi Yuri.
Quoted 7 lines
I like the way you do the extra link in Makefile.modpost. But you need to redo some parts as per comments below.
Quoted 2 lines
Fix linking modules against crtsavres.o
Please elaborate more on what this commit does.
It's a support file that needs to be linked against every module (aka libgcc like) and thus needs to be built before any module.
Cheers,
Ben.
Quoted 14 lines · Benjamin Herrenschmidt
Quoted 13 lines · Sam Ravnborg
Quoted 5 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Hi Yuri.
I like the way you do the extra link in Makefile.modpost. But you need to redo some parts as per comments below.
Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Fix linking modules against crtsavres.o
Please elaborate more on what this commit does.
It's a support file that needs to be linked against every module (aka libgcc like) and thus needs to be built before any module.
Yes.
My point was that the next version of the changelog should include this information - as well as kbuild.txt.
Sam
Hello, here is a fixed version.
Compile and export arch/powerpc/lib/crtsavres.o in order to fix the "arch/powerpc/lib/crtsavres.o not found" error when "O=" option is employed for external module compilation.
crtsavres.o is a support file, containing save/restore code from gcc, simplified down for powerpc architecture needs.
This file needs to be linked against every module and thus to be built before any module.
Documentation/kbuild/kbuild.txt | 8 ++++++++ Makefile | 2 +- arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 4 deletions(-)
arch/powerpc/Makefile +1 -1
@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +KBUILD_MODULE_LINK_SOURCE += arch/powerpc/lib/crtsavres.o endif ifeq ($(CONFIG_TUNE_CELL),y)
Documentation/kbuild/kbuild.txt +8 -0
@@ -132,3 +132,11 @@ For tags/TAGS/cscope targets, you can sp to be included in the databases, separated by blank space. E.g.: $ make ALLSOURCE_ARCHS="x86 mips arm" tags + +KBUILD_MODULE_LINK_SOURCE +-------------------------------------------------- +Compile and export arch/powerpc/lib/crtsavres.o +when "O=" option is employed for powerpc external module compilation. +This file needs to be linked against every module and thus to be built +before any module. +
Makefile +1 -1
@@ -354,7 +354,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS KBUILD_MODULE_LINK_SOURCE export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
scripts/Makefile.modpost +12 -2
@@ -122,14 +122,24 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ + cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< + +ifdef KBUILD_MODULE_LINK_SOURCE +$(KBUILD_MODULE_LINK_SOURCE): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S) +endif + +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_MODULE_LINK_SOURCE) FORCE $(call if_changed_dep,cc_o_c) targets += $(modules:.ko=.mod.o) # Step 6), final link of the modules quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \ + cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(KBUILD_MODULE_LINK_SOURCE) \ + $(LDFLAGS_MODULE) -o $@ \ $(filter-out FORCE,$^) $(modules): %.ko :%.o %.mod.o FORCE
Quoted 92 lines · Sam Ravnborg
Quoted 5 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Hi Yuri.
I like the way you do the extra link in Makefile.modpost. But you need to redo some parts as per comments below.
Quoted 2 lines
Fix linking modules against crtsavres.o
Please elaborate more on what this commit does.
Quoted 4 lines
Previously we got
CCdrivers/char/hw_random/rng-core.mod.o
LD [M]drivers/char/hw_random/rng-core.ko
/there/src/buildroot.git.ppc/build_powerpc_nofpu/staging_dir/usr/bin/powerpc-linux-uclibc-ld:arch/powerpc/lib/crtsavres.o: No such file: No such file or directoryAlways good to include error messages.
Quoted 6 lines
*
Makefile(LDFLAGS_MODULE_PREREQ): New variable to hold prerequisite files for modules.
*arch/powerpc/Makefile: add crtsavres.o toLDFLAGS_MODULE_PREREQ.
*scripts/Makefile.modpost(cmd_as_o_S): Copy from Makefile.build. (cmd_ld_ko_o): Also linkLDFLAGS_MODULE_PREREQ.
Provide rule to build objects from assembler.But this GNUism can go - we do not use it in the kernel.
Quoted 12 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>Signed-off by: Yuri Frolov <[email protected]>
Makefile | 2 ++ arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/arch/powerpc/Makefile linux-2.6-powerpc-crtsavres/arch/powerpc/Makefile
arch/powerpc/Makefile else · line 97
Quoted 6 lines
arch/powerpc/Makefile +1
-1@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o endifThe naming sucks.
How about:
KBUILD_MODULE_LINK_SOURCEThis would tell the reader that this is source to be linked on a module.
And this is an arch specific thing so no need to preset it in top-level
Makefile.
But it is mandatory to include a description inDocumentation/kbuild/kbuild.txtscripts/Makefile.modpost quiet_cmd_cc_o_c = CC $@ · line 126
Quoted 9 lines
scripts/Makefile.modpost +2
-1@@ -122,14 +122,22 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $<Align this so
cmd_as_o_Sis under each other - as we do forcmd_cc_o_cscripts/Makefile.modpost quiet_cmd_cc_o_c = CC $@ · line 130
Quoted 4 lines
scripts/Makefile.modpost +4
-0+ +$(LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S)Good catch with the mkdir - needed for O= builds.
I think we shall wrap this in
ifdefKBUILD_MODULE_LINK_SOURCE
...
endifSo we do not have an empty rule when it is not defined.
Please fix up these things and resubmit.
Thanks,
Sam
Hello,
Any news yet?
Any sort of correction needed?
Thank you,
Yuri
Quoted 174 lines · Yuri Frolov
Hello, here is a fixed version.
Compile and export
arch/powerpc/lib/crtsavres.oin order to fix the "arch/powerpc/lib/crtsavres.onot found" error when "O=" option is employed for external module compilation.
crtsavres.o is a support file, containing save/restore code from gcc, simplified down for powerpc architecture needs.
This file needs to be linked against every module and thus to be built before any module.Documentation/kbuild/kbuild.txt | 8 ++++++++ Makefile | 2 +- arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 4 deletions(-)diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/arch/powerpc/Makefile linux-2.6-powerpc-crtsavres/arch/powerpc/Makefile
arch/powerpc/Makefile +1
-1@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +KBUILD_MODULE_LINK_SOURCE += arch/powerpc/lib/crtsavres.o endif ifeq ($(CONFIG_TUNE_CELL),y)diff -urpN -X linux-2.6/Documentation/dontdiff
linux-2.6/Documentation/kbuild/kbuild.txtlinux-2.6-powerpc-crtsavres/Documentation/kbuild/kbuild.txtDocumentation/kbuild/kbuild.txt +8
-0@@ -132,3 +132,11 @@ For tags/TAGS/cscope targets, you can sp to be included in the databases, separated by blank space. E.g.: $ make ALLSOURCE_ARCHS="x86 mips arm" tags + +KBUILD_MODULE_LINK_SOURCE +-------------------------------------------------- +Compile and export arch/powerpc/lib/crtsavres.o +when "O=" option is employed for powerpc external module compilation. +This file needs to be linked against every module and thus to be built +before any module. +diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/Makefile linux-2.6-powerpc-crtsavres/Makefile
Makefile +1
-1@@ -354,7 +354,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS KBUILD_MODULE_LINK_SOURCE export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOVdiff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/scripts/Makefile.modpost linux-2.6-powerpc-crtsavres/scripts/Makefile.modpost
scripts/Makefile.modpost +12
-2@@ -122,14 +122,24 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ + cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< + +ifdef KBUILD_MODULE_LINK_SOURCE +$(KBUILD_MODULE_LINK_SOURCE): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S) +endif + +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_MODULE_LINK_SOURCE) FORCE $(call if_changed_dep,cc_o_c) targets += $(modules:.ko=.mod.o) # Step 6), final link of the modules quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \ + cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(KBUILD_MODULE_LINK_SOURCE) \ + $(LDFLAGS_MODULE) -o $@ \ $(filter-out FORCE,$^) $(modules): %.ko :%.o %.mod.o FORCEQuoted 86 lines · Sam Ravnborg
Quoted 5 lines · Yuri Frolov
Hello,
here is a corresponding bug: http://bugzilla.kernel.org/show_bug.cgi?id=11143
This patch should correctly export crtsavres.o in order to make O= option working. Please, consider to apply.Hi Yuri.
I like the way you do the extra link in Makefile.modpost. But you need to redo some parts as per comments below.
Quoted 1 line
Fix linking modules against crtsavres.o
Please elaborate more on what this commit does.
Quoted 4 lines
Previously we got
CCdrivers/char/hw_random/rng-core.mod.o
LD [M]drivers/char/hw_random/rng-core.ko
/there/src/buildroot.git.ppc/build_powerpc_nofpu/staging_dir/usr/bin/powerpc-linux-uclibc-ld:arch/powerpc/lib/crtsavres.o: No such file: No such file or directoryAlways good to include error messages.
Quoted 6 lines
*
Makefile(LDFLAGS_MODULE_PREREQ): New variable to hold prerequisite files for modules.
*arch/powerpc/Makefile: add crtsavres.o toLDFLAGS_MODULE_PREREQ.
*scripts/Makefile.modpost(cmd_as_o_S): Copy from Makefile.build. (cmd_ld_ko_o): Also linkLDFLAGS_MODULE_PREREQ.
Provide rule to build objects from assembler.But this GNUism can go - we do not use it in the kernel.
Quoted 12 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>Signed-off by: Yuri Frolov <[email protected]>
Makefile | 2 ++ arch/powerpc/Makefile | 2 +- scripts/Makefile.modpost | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)diff -urpN -X linux-2.6/Documentation/dontdiff linux-2.6/arch/powerpc/Makefile linux-2.6-powerpc-crtsavres/arch/powerpc/Makefile
arch/powerpc/Makefile else · line 97
Quoted 6 lines
arch/powerpc/Makefile +1
-1@@ -93,7 +93,7 @@ else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o +LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o endifThe naming sucks.
How about:
KBUILD_MODULE_LINK_SOURCEThis would tell the reader that this is source to be linked on a module.
And this is an arch specific thing so no need to preset it in top-level
Makefile.
But it is mandatory to include a description inDocumentation/kbuild/kbuild.txtscripts/Makefile.modpost quiet_cmd_cc_o_c = CC $@ · line 126
Quoted 9 lines
scripts/Makefile.modpost +2
-1@@ -122,14 +122,22 @@ quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $<Align this so
cmd_as_o_Sis under each other - as we do forcmd_cc_o_cscripts/Makefile.modpost quiet_cmd_cc_o_c = CC $@ · line 131
Quoted 4 lines
scripts/Makefile.modpost +4
-0+ +$(LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,as_o_S)Good catch with the mkdir - needed for O= builds.
I think we shall wrap this in
ifdefKBUILD_MODULE_LINK_SOURCE
...
endifSo we do not have an empty rule when it is not defined.
Please fix up these things and resubmit.
Thanks,
Sam