-
Notifications
You must be signed in to change notification settings - Fork 11k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[lldb] Teach LocateExecutableSymbolFile to look into LOCALBASE on FreeBSD #81355
Conversation
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write If you have received no comments on your PR for a week, you can request a review If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
@llvm/pr-subscribers-lldb Author: Gleb Popov (arrowd) ChangesRelevant change on the FreeBSD side: https://reviews.freebsd.org/D43515 @emaste @brooksdavis Full diff: https://github.com/llvm/llvm-project/pull/81355.diff 1 Files Affected:
diff --git a/lldb/source/Symbol/LocateSymbolFile.cpp b/lldb/source/Symbol/LocateSymbolFile.cpp
index 0d0e5300668fc1..4f06518170ffc4 100644
--- a/lldb/source/Symbol/LocateSymbolFile.cpp
+++ b/lldb/source/Symbol/LocateSymbolFile.cpp
@@ -22,6 +22,10 @@
#include "llvm/Support/FileSystem.h"
+#if defined(__FreeBSD__)
+#include <sys/sysctl.h>
+#endif
+
// From MacOSX system header "mach/machine.h"
typedef int cpu_type_t;
typedef int cpu_subtype_t;
@@ -300,6 +304,24 @@ Symbols::LocateExecutableSymbolFile(const ModuleSpec &module_spec,
FileSystem::Instance().Resolve(file_spec);
debug_file_search_paths.AppendIfUnique(file_spec);
}
+#if defined(__FreeBSD__)
+ // Add $LOCALBASE/lib/debug directory, where
+ // LOCALBASE is usually /usr/local, but may be adjusted by the end user
+ {
+ int mib[2];
+ char buf[PATH_MAX];
+ size_t len = PATH_MAX;
+
+ mib[0] = CTL_USER;
+ mib[1] = USER_LOCALBASE;
+ if (::sysctl(mib, 2, buf, &len, NULL, 0) == 0) {
+ std::string localbase(buf);
+ FileSpec file_spec(localbase + "/lib/debug");
+ FileSystem::Instance().Resolve(file_spec);
+ debug_file_search_paths.AppendIfUnique(file_spec);
+ }
+ }
+#endif // __FreeBSD__
#endif
#endif // _WIN32
}
|
3c49dd6
to
6ef9c18
Compare
lldb/source/Plugins/SymbolLocator/Default/SymbolLocatorDefault.cpp
Outdated
Show resolved
Hide resolved
lldb/source/Plugins/SymbolLocator/Default/SymbolLocatorDefault.cpp
Outdated
Show resolved
Hide resolved
…eBSD. Relevant change on the FreeBSD side: https://reviews.freebsd.org/D43515
6ef9c18
to
f129c63
Compare
Bump. |
Another bump. |
Another bump. Can we get this in? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is reasonable and in line with the existing special case for NetBSD, but it seems like this logic shouldn't really be here but in a target-specific file. When (live or corefile) cross-debugging a FreeBSD target we should look in $LOCALBASE/lib/debug relative to a sysroot.
@arrowd Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested Please check whether problems have been caused by your change specifically, as How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
Relevant change on the FreeBSD side: https://reviews.freebsd.org/D43515
@emaste @brooksdavis