[Lldb-commits] [lldb] r225225 - More fixes to ensure if we are asked to launch a x86_64h process on darwin, that darwin-debug knows what to do and how to handle it.

[Greg Clayton]

Author: gclayton
Date: Mon Jan  5 18:25:18 2015
New Revision: 225225

URL: http://llvm.org/viewvc/llvm-project?rev=225225&view=rev
Log:
More fixes to ensure if we are asked to launch a x86_64h process on darwin, that darwin-debug knows what to do and how to handle it.

Modified:
    lldb/trunk/source/Host/macosx/Host.mm
    lldb/trunk/tools/darwin-debug/darwin-debug.cpp

Modified: lldb/trunk/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=225225&r1=225224&r2=225225&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Mon Jan  5 18:25:18 2015
@@ -443,7 +443,8 @@ LaunchInNewTerminalWithAppleScript (cons
     darwin_debug_file_spec.GetPath(launcher_path, sizeof(launcher_path));
 
     const ArchSpec &arch_spec = launch_info.GetArchitecture();
-    if (arch_spec.IsValid())
+    // Only set the architecture if it is valid and if it isn't Haswell (x86_64h).
+    if (arch_spec.IsValid() && arch_spec.GetCore() != ArchSpec::eCore_x86_64_x86_64h)
         command.Printf("arch -arch %s ", arch_spec.GetArchitectureName());
 
     command.Printf("'%s' --unix-socket=%s", launcher_path, unix_socket_name);

Modified: lldb/trunk/tools/darwin-debug/darwin-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/darwin-debug/darwin-debug.cpp?rev=225225&r1=225224&r2=225225&view=diff
==============================================================================
--- lldb/trunk/tools/darwin-debug/darwin-debug.cpp (original)
+++ lldb/trunk/tools/darwin-debug/darwin-debug.cpp Mon Jan  5 18:25:18 2015
@@ -208,6 +208,8 @@ int main (int argc, char *const *argv, c
                     cpu_type = CPU_TYPE_I386;
 				else if (streq (optarg, "x86_64"))
                     cpu_type = CPU_TYPE_X86_64;
+                else if (streq (optarg, "x86_64h"))
+                    cpu_type = 0; // Don't set CPU type when we have x86_64h
                 else if (strstr (optarg, "arm") == optarg)
                     cpu_type = CPU_TYPE_ARM;
                 else