Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8d780d authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: fix ia64 breakage after introducing make -rR 



kbuild used $¤(*F to get filename of target without extension.
This was used in several places all over kbuild, but introducing
make -rR broke his for all cases where we specified full path to
target/prerequsite. It is assumed that make -rR disables old style
suffix-rules which is why is suddenly failed.

ia64 was impacted by this change because several div* routines in
arch/ia64/lib are build using explicit paths and then kbuild failed.

Thanks to David Mosberger-Tang <David.Mosberger@acm.org> for an explanation
what was the root-cause and for testing on ia64.

This patch also fixes two uses of $(*F) in arch/um

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 598736c5

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 


a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \

	  $(NOSTDINC_FLAGS) $(CPPFLAGS) \

	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)

	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)



quiet_cmd_as_o_S = AS      $@

cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<

arch/um/scripts/Makefile.rules

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) 
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))



$(USER_OBJS:.o=.%): \

	c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(*F).o)

	c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(basetarget).o)

$(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \

	-Dunix -D__unix__ -D__$(SUBARCH)__
@@ -17,7 +17,7 @@ $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ 
UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file))



$(UNPROFILE_OBJS:.o=.%): \

	c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(*F).o)

	c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(basetarget).o)

$(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \

	-Dunix -D__unix__ -D__$(SUBARCH)__

scripts/Kbuild.include

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ space := $(empty) $(empty) 
# contain a comma

depfile = $(subst $(comma),_,$(@D)/.$(@F).d)



###

# filename of target with directory and extension stripped

basetarget = $(basename $(notdir $@))



###

# Escape single quote for use in echo statements

escsq = $(subst $(squote),'\$(squote)',$1)

scripts/Makefile.build

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] 
$(obj-m)              : quiet_modtag := [M]



# Default for not multi-part modules

modname = $(*F)

modname = $(basetarget)



$(multi-objs-m)         : modname = $(modname-multi)

$(multi-objs-m:.o=.i)   : modname = $(modname-multi)

scripts/Makefile.host

+4 −2
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ obj-dirs += $(host-objdirs) 
#####

# Handle options to gcc. Support building with separate output directory



_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   $(HOSTCFLAGS_$(*F).o)

_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o)

_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \

                 $(HOSTCFLAGS_$(basetarget).o)

_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \

                 $(HOSTCXXFLAGS_$(basetarget).o)



ifeq ($(KBUILD_SRC),)

__hostc_flags	= $(_hostc_flags)