Attachment #258476 for bug #346953

Lines 308-314 CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C Link Here

(-)a/Makefile (-2 / +3 lines)
308	MODFLAGS = -DMODULE	308	MODFLAGS = -DMODULE
309	CFLAGS_MODULE = $(MODFLAGS)	309	CFLAGS_MODULE = $(MODFLAGS)
310	AFLAGS_MODULE = $(MODFLAGS)	310	AFLAGS_MODULE = $(MODFLAGS)
311	LDFLAGS_MODULE = -r	311	LDFLAGS_r = -r -nostdlib
		312	LDFLAGS_MODULE = $(LDFLAGS_r)
312	CFLAGS_KERNEL =	313	CFLAGS_KERNEL =
313	AFLAGS_KERNEL =	314	AFLAGS_KERNEL =
314		315
Lines 330-336 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) Link Here
330	export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \	331	export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
331	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \	332	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
332	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \	333	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
333	HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS	334	HOSTCXX HOSTCXXFLAGS LDFLAGS_r LDFLAGS_MODULE CHECK CHECKFLAGS
334		335
335	export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS	336	export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
336	export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE	337	export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE




		| $(GENKSYMS) -a $(ARCH)				\
		> $(@D)/.tmp_$(@F:.o=.ver);				\
									\
		$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(@D)/.tmp_$(@F)	\
			-T $(@D)/.tmp_$(@F:.o=.ver);			\
		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	\
	else								\

quiet_cmd_link_o_target = LD      $@
# If the list of objects to link is empty, just create an empty built-in.o
cmd_link_o_target = $(if $(strip $(obj-y)),\
		$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(filter $(obj-y), $^),\
		rm -f $@; $(AR) rcs $@)

$(builtin-target): $(obj-y) FORCE

$($(subst $(obj)/,,$(@:.o=-y)))), $^)

quiet_cmd_link_multi-y = LD      $@
cmd_link_multi-y = $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)

quiet_cmd_link_multi-m = LD [M]  $@
cmd_link_multi-m = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)

# We would rather have a list of rules like
# 	foo.o: $(foo-objs)





cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)

ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
# yet ld_flags is fed to ld.
#ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
# Remove the -Wl, prefix from linker options normally passed through gcc
ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))


# Finds the multi-part object the current object will be linked into
modname-multi = $(sort $(foreach m,$(multi-used),\

# Linking
# ---------------------------------------------------------------------------

quiet_cmd_ld = CCLD    $@
cmd_ld = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_$(@F)) \
quiet_cmd_ld = LD      $@
cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
	       $(filter-out FORCE,$^) -o $@

# Objcopy

Return to bug 346953

Lines 174-180 cmd_modversions = \ Link Here

(-)a/scripts/Makefile.build (-4 / +4 lines)
174	\| $(GENKSYMS) -a $(ARCH) \	174	\| $(GENKSYMS) -a $(ARCH) \
175	> $(@D)/.tmp_$(@F:.o=.ver); \	175	> $(@D)/.tmp_$(@F:.o=.ver); \
176	\	176	\
177	$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \	177	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(@D)/.tmp_$(@F) \
178	-T $(@D)/.tmp_$(@F:.o=.ver); \	178	-T $(@D)/.tmp_$(@F:.o=.ver); \
179	rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver); \	179	rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver); \
180	else \	180	else \
Lines 256-262 ifdef builtin-target Link Here
256	quiet_cmd_link_o_target = LD $@	256	quiet_cmd_link_o_target = LD $@
257	# If the list of objects to link is empty, just create an empty built-in.o	257	# If the list of objects to link is empty, just create an empty built-in.o
258	cmd_link_o_target = $(if $(strip $(obj-y)),\	258	cmd_link_o_target = $(if $(strip $(obj-y)),\
259	$(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\	259	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(filter $(obj-y), $^),\
260	rm -f $@; $(AR) rcs $@)	260	rm -f $@; $(AR) rcs $@)
261		261
262	$(builtin-target): $(obj-y) FORCE	262	$(builtin-target): $(obj-y) FORCE
Lines 291-300 $($(subst $(obj)/,,$(@:.o=-objs))) \ Link Here
291	$($(subst $(obj)/,,$(@:.o=-y)))), $^)	291	$($(subst $(obj)/,,$(@:.o=-y)))), $^)
292		292
293	quiet_cmd_link_multi-y = LD $@	293	quiet_cmd_link_multi-y = LD $@
294	cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)	294	cmd_link_multi-y = $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)
295		295
296	quiet_cmd_link_multi-m = LD [M] $@	296	quiet_cmd_link_multi-m = LD [M] $@
297	cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)	297	cmd_link_multi-m = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
298		298
299	# We would rather have a list of rules like	299	# We would rather have a list of rules like
300	# foo.o: $(foo-objs)	300	# foo.o: $(foo-objs)

Lines 117-128 a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ Link Here

(-)a/scripts/Makefile.lib (-10 / +3 lines)
117		117
118	cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)	118	cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)
119		119
120	# Seems to be a wrong thing to do. LDFLAGS contains gcc's flags,	120	ld_flags = $(LDFLAGS) $(EXTRA_LDFLAGS)
121	# yet ld_flags is fed to ld.
122	#ld_flags = $(LDFLAGS) $(EXTRA_LDFLAGS)
123	# Remove the -Wl, prefix from linker options normally passed through gcc
124	ld_flags = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
125
126		121
127	# Finds the multi-part object the current object will be linked into	122	# Finds the multi-part object the current object will be linked into
128	modname-multi = $(sort $(foreach m,$(multi-used),\	123	modname-multi = $(sort $(foreach m,$(multi-used),\
Lines 151-160 $(obj)/%:: $(src)/%_shipped Link Here
151	# Linking	146	# Linking
152	# ---------------------------------------------------------------------------	147	# ---------------------------------------------------------------------------
153		148
154	# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.	149	quiet_cmd_ld = CCLD $@
155	# but here we feed them to ld!	150	cmd_ld = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_$(@F)) \
156	quiet_cmd_ld = LD $@
157	cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
158	$(filter-out FORCE,$^) -o $@	151	$(filter-out FORCE,$^) -o $@
159		152
160	# Objcopy	153	# Objcopy