From 6cbae8fc5809af822f6d14826d7fe8bf09198f31 Mon Sep 17 00:00:00 2001
From: John Williams <john.williams@petalogix.com>
Date: Thu, 17 Sep 2009 21:21:23 +1000
Subject: [PATCH] --- yaml --- r: 165941 b: refs/heads/master c:
 e469b0eb36c8abf033435c4918b03eaab159e002 h: refs/heads/master i:   165939:
 0a2ee7bb2e178faf6cad90c1f667092804823c83 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/microblaze/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ba18af50b819..45921b4c2a9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac854ff1fc779101ff1989c3a20c1f238a2b5f3a
+refs/heads/master: e469b0eb36c8abf033435c4918b03eaab159e002
diff --git a/trunk/arch/microblaze/Makefile b/trunk/arch/microblaze/Makefile
index 8439598d4655..737a4dc72ed9 100644
--- a/trunk/arch/microblaze/Makefile
+++ b/trunk/arch/microblaze/Makefile
@@ -37,12 +37,12 @@ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare
 CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))
 
 # r31 holds current when in kernel mode
-KBUILD_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
+KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
 
 LDFLAGS		:=
 LDFLAGS_vmlinux	:=
 
-LIBGCC := $(shell $(CC) $(KBUILD_KERNEL) -print-libgcc-file-name)
+LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 head-y := arch/microblaze/kernel/head.o
 libs-y += arch/microblaze/lib/