From f01dc2a743b88b83b124bf3279e381bc335d9b20 Mon Sep 17 00:00:00 2001 From: Kai Germaschewski Date: Wed, 5 Mar 2003 07:51:34 -0600 Subject: kbuild: Add some missing FORCE Those were missing, not particularly harmful, but still needed for correctness. --- scripts/Makefile.modpost | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 59b848e943e2..5cf5fdf22482 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -37,7 +37,7 @@ targets += $(modules) quiet_cmd_cc_o_c = CC $@ cmd_cc_o_c = $(CC) $(CFLAGS) $(CFLAGS_MODULE) -c -o $@ $< -$(modules:.ko=.mod.o): %.mod.o: %.mod.c +$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE $(call if_changed,cc_o_c) targets += $(modules:.ko=.mod.o) @@ -51,9 +51,9 @@ $(modules:.ko=.mod.c): __modpost ; # Extract all checksums for all exported symbols quiet_cmd_modpost = MODPOST - cmd_modpost = scripts/modpost $^ + cmd_modpost = scripts/modpost $(filter-out FORCE,$^) -__modpost: $(wildcard vmlinux) $(modules:.ko=.o) +__modpost: $(wildcard vmlinux) $(modules:.ko=.o) FORCE $(call if_changed,modpost) targets += __modpost -- cgit v1.2.3 From dc39134c17c95476ffed4cbbf4f97ae961395d32 Mon Sep 17 00:00:00 2001 From: Kai Germaschewski Date: Wed, 5 Mar 2003 07:53:26 -0600 Subject: kbuild: Make per-cpu-check ignore __crc_ symbols. We warn when symbols end in __per_cpu, but aren't in the per-cpu section. However, checksum symbols gave false positives. --- scripts/per-cpu-check.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/per-cpu-check.awk b/scripts/per-cpu-check.awk index 3be9f0d25ebd..3c54bb47928f 100644 --- a/scripts/per-cpu-check.awk +++ b/scripts/per-cpu-check.awk @@ -6,7 +6,7 @@ IN_PER_CPU=0 } -/__per_cpu$$/ && ! ( / __ksymtab_/ || / __kstrtab_/ || / __kcrctab_/ ) { +/__per_cpu$$/ && ! ( / __ksymtab_/ || / __kstrtab_/ || / __kcrctab_/ || / __crc_/ ) { if (!IN_PER_CPU) { print $$3 " not in per-cpu section" > "/dev/stderr"; FOUND=1; -- cgit v1.2.3 From 28d6bf36c47b66b8b1d353fac6560649b45a6a57 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 5 Mar 2003 08:07:18 -0600 Subject: [trivial] avoid a warning for each module on s390x s390x has a reference to _GLOBAL_OFFSET_TABLE_ in each module that is resolved by the module loader. This patch prevents modpost from emitting a warning about that symbol. --- scripts/modpost.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/modpost.c b/scripts/modpost.c index 8e37d8776bfe..2d19dcdafd60 100644 --- a/scripts/modpost.c +++ b/scripts/modpost.c @@ -293,6 +293,9 @@ handle_modversions(struct module *mod, struct elf_info *info, /* undefined symbol */ if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL) break; + /* ignore global offset table */ + if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0) + break; if (memcmp(symname, MODULE_SYMBOL_PREFIX, strlen(MODULE_SYMBOL_PREFIX)) == 0) { -- cgit v1.2.3 From cc12a29a0d13985d8caf937e90d772258a441c99 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 5 Mar 2003 08:09:49 -0600 Subject: [PATCH] kbuild: touch-module after successfull creation only On Mon, Mar 03, 2003 at 05:11:10PM -0500, Bill Davidsen wrote: > scripts/Makefile.modinst:16: *** Uh-oh, you have stale module entries. You messed with SUBDIRS, do not complain if something goes wrong. This happens if you have encountered a compile error in a module. In this case you did not succeed the compilation of fs/binfmt_aout, and therefore no .o file can be located. kbuild assumes this is because you have messed with SUBDIRS, which is wrong. --- scripts/Makefile.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/Makefile.build b/scripts/Makefile.build index b43681c769fc..7f5fbbd1111c 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -163,12 +163,12 @@ endif # Single-part modules are special since we need to mark them in $(MODVERDIR) $(single-used-m): %.o: %.c FORCE - $(touch-module) ifdef CONFIG_MODVERSIONS $(call if_changed_rule,vcc_o_c) else $(call if_changed_dep,cc_o_c) endif + $(touch-module) quiet_cmd_cc_lst_c = MKLST $@ cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \ @@ -262,8 +262,8 @@ $(multi-used-y) : %.o: $(multi-objs-y) FORCE $(call if_changed,link_multi-y) $(multi-used-m) : %.o: $(multi-objs-m) FORCE - $(touch-module) $(call if_changed,link_multi-m) + $(touch-module) targets += $(multi-used-y) $(multi-used-m) -- cgit v1.2.3