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:
parent
62f24e97bd
commit
ad7aa8147a
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue