From 564e21c3820c90792d156f7523f9c798fd567084 Mon Sep 17 00:00:00 2001 From: Claudia Date: Tue, 17 Nov 2020 16:26:53 +0100 Subject: [PATCH] Update CPU families from current machine.h --- Library/Homebrew/extend/os/mac/hardware/cpu.rb | 14 ++++++++++++-- Library/Homebrew/test/hardware/cpu_spec.rb | 6 +++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/hardware/cpu.rb b/Library/Homebrew/extend/os/mac/hardware/cpu.rb index 96c6fb6fb4..eafe53a627 100644 --- a/Library/Homebrew/extend/os/mac/hardware/cpu.rb +++ b/Library/Homebrew/extend/os/mac/hardware/cpu.rb @@ -103,8 +103,18 @@ module Hardware def arm_family case sysctl_int("hw.cpufamily") + when 0x2c91a47e # ARMv8.0-A (Typhoon) + :arm_typhoon + when 0x92fb37c8 # ARMv8.0-A (Twister) + :arm_twister + when 0x67ceee93 # ARMv8.1-A (Hurricane, Zephyr) + :arm_hurricane_zephyr + when 0xe81e7ef6 # ARMv8.2-A (Monsoon, Mistral) + :arm_monsoon_mistral when 0x07d34b9f # ARMv8.3-A (Vortex, Tempest) :arm_vortex_tempest + when 0x462504d2 # ARMv8.4-A (Lightning, Thunder) + :arm_lightning_thunder when 0x573b5eec, 0x1b588bb3 # ARMv8.4-A (Firestorm, Icestorm) :arm_firestorm_icestorm else @@ -122,8 +132,8 @@ module Hardware :penryn when 0x6b5a4cd2 # Nehalem :nehalem - when 0x573b5eec # Arrandale - :arrandale + when 0x573b5eec # Westmere + :westmere when 0x5490b78c # Sandy Bridge :sandybridge when 0x1f65e835 # Ivy Bridge diff --git a/Library/Homebrew/test/hardware/cpu_spec.rb b/Library/Homebrew/test/hardware/cpu_spec.rb index 75d336e7d8..7c6bf9cde4 100644 --- a/Library/Homebrew/test/hardware/cpu_spec.rb +++ b/Library/Homebrew/test/hardware/cpu_spec.rb @@ -23,8 +23,12 @@ describe Hardware::CPU do let(:cpu_families) { [ :arm_firestorm_icestorm, + :arm_hurricane_zephyr, + :arm_lightning_thunder, + :arm_monsoon_mistral, + :arm_twister, + :arm_typhoon, :arm_vortex_tempest, - :arrandale, :atom, :broadwell, :core,