diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-01 05:06:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-01 05:06:48 -0800 |
| commit | 97ae712423fd10284012a665abcf6f8a44c95a66 (patch) | |
| tree | 636d4bb118ea71449abc8889433b40eec07754ad /scripts | |
| parent | b5a8e8b86026ef3b6ddfcebea1d69344707c1bad (diff) | |
| parent | 8d81094b01532c758cc166325997cd3c36a3dbd8 (diff) | |
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 6 | ||||
| -rw-r--r-- | scripts/kallsyms | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 95026d841a1c..c8e1528aae55 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -124,14 +124,14 @@ depfile = $(subst $(comma),_,$(@D)/.$(@F).d) # than one module. In that case KBUILD_MODNAME will be set to foo_bar, # where foo and bar are the name of the modules. basename_flags = -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -modname_flags = -DKBUILD_MODNAME=$(subst $(comma),_,$(subst -,_,$(modname))) +modname_flags = $(if $(filter 1,$(words $(modname))),-DKBUILD_MODNAME=$(subst $(comma),_,$(subst -,_,$(modname)))) c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \ $(modkern_cflags) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) \ $(basename_flags) $(modname_flags) $(export_flags) # Finds the multi-part object the current object will be linked into -modname-multi = $(subst $(space),_,$(sort $(foreach m,$(multi-used),\ - $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))) +modname-multi = $(sort $(foreach m,$(multi-used),\ + $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))) # Shipped files # =========================================================================== diff --git a/scripts/kallsyms b/scripts/kallsyms index db057d0974dc..72a51e0dbdd7 100644 --- a/scripts/kallsyms +++ b/scripts/kallsyms @@ -31,7 +31,7 @@ encode_symbols() } # FIXME: Use System.map as input, and regenerate each time in Makefile. -$NM $1 | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > kallsyms.map +$NM -n $1 | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > kallsyms.map encode_symbols kallsyms.map > kallsyms.c $CC $CFLAGS -c -o $2 kallsyms.c |