diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-06 05:02:28 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-06 05:02:28 -0800 |
| commit | f77e4f66bd42724c138ae6231e780a4952075dfb (patch) | |
| tree | 8a1d87e0b6aa884f92edbe4f35523c38e106ff2e /scripts | |
| parent | dd2bb6833dc2a8358626e2bc4812b0e708c609ae (diff) | |
| parent | 72574bb361ee715705b1880befa7eba6eea0f256 (diff) | |
| download | history-f77e4f66bd42724c138ae6231e780a4952075dfb.tar.gz | |
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 4 | ||||
| -rw-r--r-- | scripts/Makefile.modpost | 6 | ||||
| -rw-r--r-- | scripts/modpost.c | 3 | ||||
| -rw-r--r-- | scripts/per-cpu-check.awk | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index b43681c769fcd..7f5fbbd1111cc 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) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 59b848e943e23..5cf5fdf224828 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 diff --git a/scripts/modpost.c b/scripts/modpost.c index 8e37d8776bfea..2d19dcdafd608 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) { diff --git a/scripts/per-cpu-check.awk b/scripts/per-cpu-check.awk index 3be9f0d25ebd3..3c54bb47928fe 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; |