Try to normalize arm* to "arm"

2 files changed, 10 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 17df1ac..09eef7b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -40,6 +40,9 @@ CPU = case RbConfig::CONFIG['host_cpu'].downcase
   when /ppc|powerpc/
     "powerpc"
 
+  when /^arm/
+    "arm"
+
   else
     RbConfig::CONFIG['host_cpu']
   end
@@ -74,7 +77,7 @@ PROJ.name = 'ffi'
 PROJ.authors = 'Wayne Meissner'
 PROJ.email = 'wmeissner@gmail.com'
 PROJ.url = 'http://wiki.github.com/ffi/ffi'
-PROJ.version = '1.1.1'
+PROJ.version = '1.1.2.dev'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 
diff --git a/lib/ffi/platform.rb b/lib/ffi/platform.rb
index 4021733..847f149 100644
--- a/lib/ffi/platform.rb
+++ b/lib/ffi/platform.rb
@@ -51,7 +51,12 @@ module FFI
     when /ppc|powerpc/
       "powerpc"
     else
-      RbConfig::CONFIG['host_cpu']
+      case RbConfig::CONFIG['host_cpu']
+      when /^arm/
+        "arm"
+      else
+        RbConfig::CONFIG['host_cpu']
+      end
     end
 
     private