The patch titled vDSO hash-style fix has been added to the -mm tree. Its filename is vdso-hash-style-fix-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: vDSO hash-style fix From: Roland McGrath <roland@xxxxxxxxxx> Here is a new version of the patch that addresses the issues cited. Signed-off-by: Roland McGrath <roland@xxxxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Documentation/kbuild/makefiles.txt | 14 ++++++++++++++ scripts/Kbuild.include | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff -puN Documentation/kbuild/makefiles.txt~vdso-hash-style-fix-fix Documentation/kbuild/makefiles.txt --- a/Documentation/kbuild/makefiles.txt~vdso-hash-style-fix-fix +++ a/Documentation/kbuild/makefiles.txt @@ -412,6 +412,20 @@ more details, with real examples. and then outputs either option1 or option2 C escapes are supported in the test instruction + ld-option + ld-option is used to check if $(CC) when used to link object files + supports the given option. An optional second option may be + specified if first option are not supported. + + Example: + #arch/i386/kernel/Makefile + vsyscall-flags += $(call ld-option, -Wl$(comma)--hash-style=sysv) + + In the above example vsyscall-flags will be assigned the option + -Wl$(comma)--hash-style=sysv if it is supported by $(CC). + The second argument is optional, and if supplied will be used + if first argument is not supported. + cc-option cc-option is used to check if $(CC) support a given option, and not supported to use an optional second option. diff -puN scripts/Kbuild.include~vdso-hash-style-fix-fix scripts/Kbuild.include --- a/scripts/Kbuild.include~vdso-hash-style-fix-fix +++ a/scripts/Kbuild.include @@ -97,8 +97,9 @@ cc-ifversion = $(shell if [ $(call cc-ve # ld-option # Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both) ld-option = $(shell if $(CC) $(1) \ - -nostdlib -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) + -nostdlib -o ldtest$$$$.out -xc /dev/null \ + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi; \ + rm -f ldtest$$$$.out) ### # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= _ Patches currently in -mm which might be from roland@xxxxxxxxxx are vdso-hash-style-fix.patch vdso-hash-style-fix-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html