-
-
Notifications
You must be signed in to change notification settings - Fork 217
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
Implement backtrace printing for non-glibc targets #265
Conversation
/link #242 |
The |
Okay, just saw your comment. I understood as to how to solve this. |
I've tested the Android version. It didn't work out of the box, but worked after fixing compiler options a bit: f6e049c. This is pushed to develop. |
I found a few errors (broken link, missing flags etc.) while downloading dependencies. These could be platform specific. Should I fix them in a separate PR? |
Yep, would be great. |
Looks good! But the addition of Also please rebase your branch on fresh develop branch and squash commits into one or two (one for libunwind + scons and one for bionic), and then we can merge this. |
bf4a008
to
9273055
Compare
It seems you forgot to pull a fresh develop branch from upstream before rebasing on it. It has 5 new commits and there are conflicts. |
9273055
to
f8baf3d
Compare
Yeah I'm trying to re-base it properly & fix the conflicts. Will be done. |
OK, ping me when it will be ready for merge. |
3a76109
to
14e8ba4
Compare
I pulled the fresh develop branch but I can't squash the commits properly because I was earlier using another branch |
Yes, it's quite important for us because our goal is to keep the git history linear and human-readable. Here is how you can do it in your case:
Here is your history now (you can see it using "gitk" command): Then:
Here is your history after rebase. As you see, it became linear: Then:
The last command will spawn an editor where you can edit the history. You'll need to change "pick" to "squash" in every line except the very first one: And then save your changes and exit the editor. After that the editor will be spawned once more and you'll have to edit the commit message, like this: Then, again, you save your changes and exit the editor. After that the rebase finishes. Here is your history now: As you can see, it is a single commit on top of upstream/develop. Now you can push it to your fork:
|
BTW, personally I'd recommend to avoid using GUI tools to manipulate git history. In my experience, they usually only give an illusion of simplicity and can't really exempt from understanding how git works in any non-trivial case. |
Also, don't forget to remove |
implemented backtrace for musl libc made print_backtrace_emergency() signal safe added demangling for print_backtrace() only added print_backtrace() for bionic changing from musl to libunwind adding a no-op backtrace implementation fixed a minor mistake fixed coding styles, added namespaces and other issues removed warnings from bionic backtrace fixed all errors and added safe_strcat() fixed a bug in safe_strcat() modifying safe_strcat & adding print_emergency_message() adding code for libunwind in SConstruct & 3rdpart.py fixed minor mistake removing errors in SConstruct edited print format in libunwind modifying SConstruct fixed libunwind download link fixed spelling for CheckLibWithHeaderExt fixed evn & edited flags respectively changed print format in backtrace.cpp & fixed paths in 3rdparty.py removing empty lines rollback to previous link for SoX removing few more empty lines backtrace printing for bionic & libunwind and added libunwind to scons added backtrace printing for bionic & libunwind
14e8ba4
to
75a21cb
Compare
It worked now. Earlier, I did not make the history linear and I was just squashing all commits. Now I understand how to work with such issues. Thank you! |
You're welcome. LGTM. Can we merge this? |
Yes. Everything is done. |
Thanks for finishing this! |
Follow-up commit (formatting): 856ecf6 |
#249
Still working on this, just referenced this PR.