* Re: ia64 breakage in current -git
2006-06-27 8:06 ia64 breakage in current -git Andrew Morton
@ 2006-06-29 18:42 ` David Mosberger-Tang
2006-06-30 22:43 ` Sam Ravnborg
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Mosberger-Tang @ 2006-06-29 18:42 UTC (permalink / raw)
To: linux-ia64
The problem seems to come from the use of $(*F) in Makefile.lib:
_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
If I use $(@F) instead of $(*F).o, the build works fine.
Using $(*F) seems wrong to me, since it expands to the stem, which in
the case of an explicit rule is the target-name minus any recognized
suffixes or the empty string if the target doesn't have a recognized
suffix. I assume with -r, the old-fashioned suffix-rules are disabled
and hence $(*F) always yields the empty string for explicit rules.
Does this make sense?
--david
On 6/27/06, Andrew Morton <akpm@osdl.org> wrote:
>
>
> fyi, Linus's current tree is bust on ia64 - you get a lot of link-time
> warnings about missing __udivdi3 and things.
>
> The below will get things going again.
>
> diff -puN Makefile~revert-ignore-makes-built-in-rules-variables Makefile
> --- a/Makefile~revert-ignore-makes-built-in-rules-variables
> +++ a/Makefile
> @@ -276,9 +276,9 @@ MAKEFLAGS += --include-dir=$(srctree)
> # We need some generic definitions
> include $(srctree)/scripts/Kbuild.include
>
> -# Do not use make's built-in rules and variables
> -# This increases performance and avoid hard-to-debug behavour
> -MAKEFLAGS += -rR
> +# For maximum performance (+ possibly random breakage, uncomment
> +# the following)
> +#MAKEFLAGS += -rR
>
> # Make variables (CC, etc...)
>
> _
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Mosberger Consulting LLC, http://www.mosberger-consulting.com/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: ia64 breakage in current -git
2006-06-27 8:06 ia64 breakage in current -git Andrew Morton
2006-06-29 18:42 ` David Mosberger-Tang
@ 2006-06-30 22:43 ` Sam Ravnborg
2006-06-30 22:48 ` Sam Ravnborg
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2006-06-30 22:43 UTC (permalink / raw)
To: linux-ia64
On Thu, Jun 29, 2006 at 12:42:27PM -0600, David Mosberger-Tang wrote:
> The problem seems to come from the use of $(*F) in Makefile.lib:
>
> _a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
>
> If I use $(@F) instead of $(*F).o, the build works fine.
Except that we do not always have targets named *.o.
Following is my fix. I have test-compiled a ia64 kernel and checked
the output using some debug statements.
On top of linus- latest.
It would be good if you could try building your kernel with this fix
just to make sure I did not brake anything (it is past midnight here).
Sam
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 53e53a2..e8e7d27 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -117,7 +117,7 @@ quiet_modtag := $(empty) $(empty)
$(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)
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 2b066d1..18ecd4d 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -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)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 2cb4935..fc498fe 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -82,12 +82,12 @@ # Note: It's possible that one object ge
# than one module. In that case KBUILD_MODNAME will be set to foo_bar,
# where foo and bar are the name of the modules.
name-fix = $(subst $(comma),_,$(subst -,_,$1))
-basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
+basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
modname_flags = $(if $(filter 1,$(words $(modname))),\
-D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
-_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
-_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
+_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o)
+_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)
_cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))
# If building the kernel in a separate objtree expand all occurrences
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 576cce5..e83613e 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -72,7 +72,7 @@ # Declare generated files as targets for
# Step 5), compile all *.mod.c files
# modname is set to make c_flags define KBUILD_MODNAME
-modname = $(*F)
+modname = $(basetarget)
quiet_cmd_cc_o_c = CC $@
cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: ia64 breakage in current -git
2006-06-27 8:06 ia64 breakage in current -git Andrew Morton
2006-06-29 18:42 ` David Mosberger-Tang
2006-06-30 22:43 ` Sam Ravnborg
@ 2006-06-30 22:48 ` Sam Ravnborg
2006-07-01 3:46 ` David Mosberger-Tang
2006-07-01 6:34 ` Sam Ravnborg
4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2006-06-30 22:48 UTC (permalink / raw)
To: linux-ia64
Crap.
Ignore the last patch I sent - it was the old one which is buggy.
The following is the right one (did I say it was past midnight...)
Sam
diff --git a/Makefile b/Makefile
index e9560c6..c4ea9cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1352,7 +1352,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm
a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \
$(NOSTDINC_FLAGS) $(CPPFLAGS) \
- $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
+ $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(notdir $@))
quiet_cmd_as_o_S = AS $@
cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index 1347dc6..813077f 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y)
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 @@ # using it directly.
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)__
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index b0d067b..2180c88 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -13,6 +13,10 @@ # 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)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 02a7eea..3cb445c 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -117,7 +117,7 @@ quiet_modtag := $(empty) $(empty)
$(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)
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 2b066d1..18ecd4d 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -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)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 2cb4935..fc498fe 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -82,12 +82,12 @@ # Note: It's possible that one object ge
# than one module. In that case KBUILD_MODNAME will be set to foo_bar,
# where foo and bar are the name of the modules.
name-fix = $(subst $(comma),_,$(subst -,_,$1))
-basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
+basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
modname_flags = $(if $(filter 1,$(words $(modname))),\
-D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
-_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
-_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
+_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o)
+_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)
_cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))
# If building the kernel in a separate objtree expand all occurrences
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 576cce5..a495502 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -72,7 +72,7 @@ # Declare generated files as targets for
# Step 5), compile all *.mod.c files
# modname is set to make c_flags define KBUILD_MODNAME
-modname = $(*F)
+modname = $(notdir $(@:.mod.o=))
quiet_cmd_cc_o_c = CC $@
cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: ia64 breakage in current -git
2006-06-27 8:06 ia64 breakage in current -git Andrew Morton
` (2 preceding siblings ...)
2006-06-30 22:48 ` Sam Ravnborg
@ 2006-07-01 3:46 ` David Mosberger-Tang
2006-07-01 6:34 ` Sam Ravnborg
4 siblings, 0 replies; 6+ messages in thread
From: David Mosberger-Tang @ 2006-07-01 3:46 UTC (permalink / raw)
To: linux-ia64
Hi Sam,
I build- and boot-tested this patch on a zx2000. Seems to work fine.
Thanks!
--david
On 6/30/06, Sam Ravnborg <sam@ravnborg.org> wrote:
> Crap.
> Ignore the last patch I sent - it was the old one which is buggy.
> The following is the right one (did I say it was past midnight...)
>
> Sam
>
> diff --git a/Makefile b/Makefile
> index e9560c6..c4ea9cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1352,7 +1352,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm
>
> a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \
> $(NOSTDINC_FLAGS) $(CPPFLAGS) \
> - $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
> + $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(notdir $@))
>
> quiet_cmd_as_o_S = AS $@
> cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
> diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
> index 1347dc6..813077f 100644
> --- a/arch/um/scripts/Makefile.rules
> +++ b/arch/um/scripts/Makefile.rules
> @@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y)
> 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 @@ # using it directly.
> 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)__
>
> diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
> index b0d067b..2180c88 100644
> --- a/scripts/Kbuild.include
> +++ b/scripts/Kbuild.include
> @@ -13,6 +13,10 @@ # 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)
>
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index 02a7eea..3cb445c 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -117,7 +117,7 @@ quiet_modtag := $(empty) $(empty)
> $(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)
> diff --git a/scripts/Makefile.host b/scripts/Makefile.host
> index 2b066d1..18ecd4d 100644
> --- a/scripts/Makefile.host
> +++ b/scripts/Makefile.host
> @@ -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)
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 2cb4935..fc498fe 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -82,12 +82,12 @@ # Note: It's possible that one object ge
> # than one module. In that case KBUILD_MODNAME will be set to foo_bar,
> # where foo and bar are the name of the modules.
> name-fix = $(subst $(comma),_,$(subst -,_,$1))
> -basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
> +basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
> modname_flags = $(if $(filter 1,$(words $(modname))),\
> -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
>
> -_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
> -_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
> +_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o)
> +_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)
> _cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))
>
> # If building the kernel in a separate objtree expand all occurrences
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index 576cce5..a495502 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -72,7 +72,7 @@ # Declare generated files as targets for
> # Step 5), compile all *.mod.c files
>
> # modname is set to make c_flags define KBUILD_MODNAME
> -modname = $(*F)
> +modname = $(notdir $(@:.mod.o=))
>
> quiet_cmd_cc_o_c = CC $@
> cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \
>
--
Mosberger Consulting LLC, http://www.mosberger-consulting.com/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: ia64 breakage in current -git
2006-06-27 8:06 ia64 breakage in current -git Andrew Morton
` (3 preceding siblings ...)
2006-07-01 3:46 ` David Mosberger-Tang
@ 2006-07-01 6:34 ` Sam Ravnborg
4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2006-07-01 6:34 UTC (permalink / raw)
To: linux-ia64
On Fri, Jun 30, 2006 at 09:46:32PM -0600, David Mosberger-Tang wrote:
> Hi Sam,
>
> I build- and boot-tested this patch on a zx2000. Seems to work fine.
Thanks for testing. I will push a bit later today.
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread