modname can be calculated much more simply. If modname-multi is empty, it is a single-used object. So, modname = $(basetarget). Otherwise, modname = $(modname-multi).
Unified · Split
| @@ -131,17 +131,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] · 130 unmodified lines | ||
| 131 | 131 | |
| 132 | 132 | $(obj-m) : quiet_modtag := [M] |
| 133 | 133 | |
| 134 | −# Default for not multi-part modules | |
| 135 | −modname = $(basetarget) | |
| 136 | − | |
| 137 | −$(multi-objs-m) : modname = $(modname-multi) | |
| 138 | −$(multi-objs-m:.o=.i) : modname = $(modname-multi) | |
| 139 | −$(multi-objs-m:.o=.s) : modname = $(modname-multi) | |
| 140 | −$(multi-objs-m:.o=.lst) : modname = $(modname-multi) | |
| 141 | −$(multi-objs-y) : modname = $(modname-multi) | |
| 142 | −$(multi-objs-y:.o=.i) : modname = $(modname-multi) | |
| 143 | −$(multi-objs-y:.o=.s) : modname = $(modname-multi) | |
| 144 | −$(multi-objs-y:.o=.lst) : modname = $(modname-multi) | |
| 134 | +modname = $(if $(modname-multi),$(modname-multi),$(basetarget)) | |
| 145 | 135 | |
| 146 | 136 | quiet_cmd_cc_s_c = CC $(quiet_modtag) $@ |
| 147 | 137 | cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $< |
| @@ -47,11 +47,6 @@ multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m · 46 unmodified lines | ||
| 47 | 47 | multi-used := $(multi-used-y) $(multi-used-m) |
| 48 | 48 | single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m))) |
| 49 | 49 | |
| 50 | −# Build list of the parts of our composite objects, our composite | |
| 51 | −# objects depend on those (obviously) | |
| 52 | −multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y))) | |
| 53 | −multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))) | |
| 54 | − | |
| 55 | 50 | # $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to |
| 56 | 51 | # tell kbuild to descend |
| 57 | 52 | subdir-obj-y := $(filter %/built-in.a, $(obj-y)) |
| @@ -80,8 +75,6 @@ real-objs-m := $(addprefix $(obj)/,$(real-objs-m)) · 22 unmodified lines | ||
| 80 | 75 | single-used-m := $(addprefix $(obj)/,$(single-used-m)) |
| 81 | 76 | multi-used-y := $(addprefix $(obj)/,$(multi-used-y)) |
| 82 | 77 | multi-used-m := $(addprefix $(obj)/,$(multi-used-m)) |
| 83 | −multi-objs-y := $(addprefix $(obj)/,$(multi-objs-y)) | |
| 84 | −multi-objs-m := $(addprefix $(obj)/,$(multi-objs-m)) | |
| 85 | 78 | subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) |
| 86 | 79 | |
| 87 | 80 | # These flags are needed for modversions and compiling, so we define them here |