This is an archive of the discontinued LLVM Phabricator instance.

Differential D52507

Fix FreeBSD build after r342633.
ClosedPublic

Authored by brooks on Sep 25 2018, 10:15 AM.

Details

Reviewers
JDevlieghere
emaste
dim

Diff Detail

Event Timeline

brooks created this revision.Sep 25 2018, 10:15 AM
brooks added a comment.Sep 25 2018, 10:16 AM

See also: D51859

Harbormaster completed remote builds in B23093: Diff 166944.Sep 25 2018, 10:17 AM
emaste accepted this revision.Sep 25 2018, 10:19 AM

The FreeBSD build bot was down for a little over a week due to an IP address issue, but is back now: http://lab.llvm.org:8011/builders/lldb-amd64-ninja-freebsd11

(D51859)

This revision is now accepted and ready to land.Sep 25 2018, 10:19 AM
JDevlieghere accepted this revision.Sep 26 2018, 11:55 AM

Thanks!

JDevlieghere closed this revision.Nov 5 2018, 6:50 PM

I believe this was landed.

Revision Contents

PathSize
source/
Plugins/
Process/
FreeBSD/
4 lines

Diff 166944

source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp

Show First 20 Lines • Show All 329 Lines • ▼ Show 20 LinesProcessFreeBSD::DoAttachToProcessWithID(lldb::pid_t pid,
// Fix the target architecture if necessary // Fix the target architecture if necessary
const ArchSpec &module_arch = exe_module_sp->GetArchitecture(); const ArchSpec &module_arch = exe_module_sp->GetArchitecture();
if (module_arch.IsValid() && if (module_arch.IsValid() &&
!GetTarget().GetArchitecture().IsExactMatch(module_arch)) !GetTarget().GetArchitecture().IsExactMatch(module_arch))
GetTarget().SetArchitecture(module_arch); GetTarget().SetArchitecture(module_arch);
// Initialize the target module list // Initialize the target module list
GetTarget().SetExecutableModule(exe_module_sp, true); GetTarget().SetExecutableModule(exe_module_sp, eLoadDependentsYes);
SetSTDIOFileDescriptor(m_monitor->GetTerminalFD()); SetSTDIOFileDescriptor(m_monitor->GetTerminalFD());
SetID(pid); SetID(pid);
return error; return error;
} }
▲ Show 20 Lines • Show All 167 Lines • ▼ Show 20 Lines if (platform_sp) {
target->GetArchitecture()); target->GetArchitecture());
FileSpecList executable_search_paths( FileSpecList executable_search_paths(
Target::GetDefaultExecutableSearchPaths()); Target::GetDefaultExecutableSearchPaths());
Status error = platform_sp->ResolveExecutable( Status error = platform_sp->ResolveExecutable(
exe_module_spec, exe_module_sp, exe_module_spec, exe_module_sp,
executable_search_paths.GetSize() ? &executable_search_paths : NULL); executable_search_paths.GetSize() ? &executable_search_paths : NULL);
if (!error.Success()) if (!error.Success())
return; return;
target->SetExecutableModule(exe_module_sp, true); target->SetExecutableModule(exe_module_sp, eLoadDependentsYes);
} }
} }
} }
bool ProcessFreeBSD::AddThreadForInitialStopIfNeeded(lldb::tid_t stop_tid) { bool ProcessFreeBSD::AddThreadForInitialStopIfNeeded(lldb::tid_t stop_tid) {
bool added_to_set = false; bool added_to_set = false;
ThreadStopSet::iterator it = m_seen_initial_stop.find(stop_tid); ThreadStopSet::iterator it = m_seen_initial_stop.find(stop_tid);
if (it == m_seen_initial_stop.end()) { if (it == m_seen_initial_stop.end()) {
▲ Show 20 Lines • Show All 564 Lines • Show Last 20 Lines