diff --git a/[refs] b/[refs]
index 282e539baa5c..16c5eab40813 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9f874b6f761f7f8394157d28641491c9babc1d3
+refs/heads/master: e58d95abb7b3232333ab35a09f7f5b0cd6a19cdb
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index b0fac2d436b7..ebd5d02a7d78 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -602,7 +602,9 @@ ifdef CONFIG_64BIT
   endif
 
   ifeq ($(KBUILD_SYM32), y)
-    cflags-y += -msym32 -DKBUILD_64BIT_SYM32
+    ifeq ($(call cc-option-yn,-msym32), y)
+      cflags-y += -msym32 -DKBUILD_64BIT_SYM32
+    endif
   endif
 endif