replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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. 

llvm-svn: 225225
This commit is contained in:
Greg Clayton 2015-01-06 00:25:18 +00:00
parent 62f24e97bd
commit ad7aa8147a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/source/Host/macosx/Host.mm
View File

@ -443,7 +443,8 @@ LaunchInNewTerminalWithAppleScript (const char *exe_path, ProcessLaunchInfo &lau
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);

2
lldb/tools/darwin-debug/darwin-debug.cpp
View File

@ -208,6 +208,8 @@ int main (int argc, char *const *argv, char *const *envp, const char **apple)
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