[PATCH] [39/223] microblaze: Fix build with make 3.82

From: Andi Kleen
Date: Sun Dec 12 2010 - 19:26:38 EST


2.6.35-longterm review patch. If anyone has any objections, please let me know.

------------------
From: Thomas Backlund <tmb@xxxxxxxxxxxx>

commit b843e4ec01991a386a9e0e9030703524446e03da upstream.

When running make headers_install_all on x86_64 and make 3.82 I hit this:

arch/microblaze/Makefile:80: *** mixed implicit and normal rules. Stop.
make: *** [headers_install_all] Error 2

So split the rules to satisfy make 3.82.

Signed-off-by: Thomas Backlund <tmb@xxxxxxxxxxxx>
Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>

---
arch/microblaze/Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

Index: linux/arch/microblaze/Makefile
===================================================================
--- linux.orig/arch/microblaze/Makefile
+++ linux/arch/microblaze/Makefile
@@ -72,12 +72,16 @@ export MMU DTB

all: linux.bin

-BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.%
+# With make 3.82 we cannot mix normal and wildcard targets
+BOOT_TARGETS1 = linux.bin linux.bin.gz
+BOOT_TARGETS2 = simpleImage.%

archclean:
$(Q)$(MAKE) $(clean)=$(boot)

-$(BOOT_TARGETS): vmlinux
+$(BOOT_TARGETS1): vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
+$(BOOT_TARGETS2): vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

define archhelp
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/