1 files changed, 30 insertions, 10 deletions
diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb
index ded0c9ccb..b139215ae 100644
--- a/Library/Homebrew/hardware.rb
+++ b/Library/Homebrew/hardware.rb
@@ -1,11 +1,39 @@
+require 'hardware_compat'
+
 class Hardware
+  module CPU extend self
+    def type
+      @type || :dunno
+    end
+
+    def family
+      @family || :dunno
+    end
+
+    def cores
+      @cores || 1
+    end
+
+    def bits
+      @bits || 64
+    end
+
+    def is_32_bit?
+      bits == 32
+    end
+
+    def is_64_bit?
+      bits == 64
+    end
+  end
+
   case RUBY_PLATFORM.downcase
   when /darwin/
     require 'os/mac/hardware'
-    extend MacOSHardware
+    CPU.extend MacCPUs
   when /linux/
     require 'os/linux/hardware'
-    extend LinuxHardware
+    CPU.extend LinuxCPUs
   else
     raise "The system `#{`uname`.chomp}' is not supported."
   end
@@ -19,12 +47,4 @@ class Hardware
       Hardware.processor_count
     end
   end
-
-  def self.is_32_bit?
-    not self.is_64_bit?
-  end
-
-  def self.bits
-    Hardware.is_64_bit? ? 64 : 32
-  end
 end