Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[pandora-kernel.git] / scripts / Makefile.build

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 6a21538..5d90030 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -212,16 +212,10 @@ cmd_modversions =                                                 \
        fi;
 endif
 
        fi;
 endif
 

-ifdef CONFIG_64BIT
-arch_bits = 64
-else
-arch_bits = 32
-endif
-

 ifdef CONFIG_FTRACE_MCOUNT_RECORD
 ifdef CONFIG_FTRACE_MCOUNT_RECORD

-cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl \
-       "$(ARCH)" "$(arch_bits)" "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" \
-       "$(NM)" "$(RM)" "$(MV)" "$(@)";
+cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
+       "$(if $(CONFIG_64BIT),64,32)" \
+       "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" "$(@)";

 endif
 
 define rule_cc_o_c
 endif
 
 define rule_cc_o_c