Merge commit 'v2.6.33' into tracing/core

[karo-tx-linux.git] / scripts / recordmcount.pl

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 545fe7154ced10322cd142af5db83e501c1fbeb9..f3c9c0a90b98cad68389da5d591a9921e1cb8f39 100755 (executable)
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -195,8 +195,12 @@ sub check_objcopy
     }
 }
 
-if ($arch eq 'x86') {
-    $arch = ($bits == 64) ? 'x86_64' : 'i386';
+if ($arch =~ /(x86(_64)?)|(i386)/) {
+    if ($bits == 64) {
+       $arch = "x86_64";
+    } else {
+       $arch = "i386";
+    }
 }
 
 #