diff --git a/lldb/source/Plugins/Process/Linux/LinuxThread.cpp b/lldb/source/Plugins/Process/Linux/LinuxThread.cpp
index 5c278d4..397d31b 100644
--- a/lldb/source/Plugins/Process/Linux/LinuxThread.cpp
+++ b/lldb/source/Plugins/Process/Linux/LinuxThread.cpp
@@ -65,13 +65,13 @@
     {
         ArchSpec arch = process.GetTarget().GetArchitecture();
 
-        switch (arch.GetGenericCPUType())
+        switch (arch.GetCore())
         {
         default:
             assert(false && "CPU type not supported!");
             break;
 
-        case ArchSpec::eCPU_x86_64:
+        case ArchSpec::eCore_x86_64_x86_64:
             m_reg_context_sp.reset(new RegisterContextLinux_x86_64(*this, 0));
             break;
         }
diff --git a/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp
index 9939fe7..f62a303 100644
--- a/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp
@@ -353,14 +353,14 @@
     const uint8_t *opcode = NULL;
     size_t opcode_size = 0;
 
-    switch (arch.GetGenericCPUType())
+    switch (arch.GetCore())
     {
     default:
         assert(false && "CPU type not supported!");
         break;
 
-    case ArchSpec::eCPU_i386:
-    case ArchSpec::eCPU_x86_64:
+    case ArchSpec::eCore_x86_32_i386:
+    case ArchSpec::eCore_x86_64_x86_64:
         opcode = g_i386_opcode;
         opcode_size = sizeof(g_i386_opcode);
         break;