Skip to content
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

[LLVMLibUnwind] Add version 14.0.6 #6041

Merged
merged 5 commits into from
Dec 30, 2022
Merged

[LLVMLibUnwind] Add version 14.0.6 #6041

merged 5 commits into from
Dec 30, 2022

Conversation

ararslan
Copy link
Member

No description provided.

@giordano
Copy link
Member

CC @gbaraldi in case this helps with JuliaLang/julia#48020

@gbaraldi
Copy link
Contributor

I tried just building from the LLVM repo, but I guess I'm missing some patches, so when yggdrasil is back soon ™️ I will try this out.

@giordano
Copy link
Member

Building this in codespaces I get

[15:24:52] CMake Error at /workspace/srcdir/cmake/Modules/HandleOutOfTreeLLVM.cmake:6 (message):
[15:24:52]   The provided LLVM_PATH (/workspace/srcdir/cmake/Modules/../../llvm) is not
[15:24:52]   a valid directory.  Note that building libc++ outside of the monorepo is
[15:24:52]   not supported anymore.  Please use a Standalone build against the monorepo,
[15:24:52]   a Runtimes build or a classic monorepo build.
[15:24:52] Call Stack (most recent call first):
[15:24:52]   CMakeLists.txt:46 (include)
[15:24:52] 
[15:24:52] 
[15:24:52] -- Configuring incomplete, errors occurred!
[15:24:52] See also "/workspace/srcdir/libunwind-14.0.6.src/build/CMakeFiles/CMakeOutput.log".
[15:24:52] See also "/workspace/srcdir/libunwind-14.0.6.src/build/CMakeFiles/CMakeError.log".

@giordano
Copy link
Member

For the record, compilation is successful, at least for aarch64-apple-darwin, if using as source the full llvm-project tarball, instead of the single libunwind one.

@ararslan
Copy link
Member Author

Does that mean we should actually try again to do #3540? 😱 Or is it sufficient to switch from using the standalone source tarball for libunwind to the full LLVM one? For 12.0.1 I added a bundled patch that reverts the commit that disallowed standalone builds, but enough has changed since then that it'd be a real pain to adapt that patch. That's why for this one I just added a patch that deletes the error at the top and hoped for the best...

@giordano
Copy link
Member

Or is it sufficient to switch from using the standalone source tarball for libunwind to the full LLVM one?

I downloaded the llvm-project tarball and it worked out smoothly. I did it inside the build environment, I didn't update the build script locally, but it shouldn't be too hard

@giordano giordano force-pushed the aa/llvm-libunwind-14 branch from 16fad8f to e59410e Compare December 30, 2022 21:37
#ifndef __DWARF_PARSER_HPP__
#define __DWARF_PARSER_HPP__

+#define __STDC_FORMAT_MACROS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

…ailable

Fixes errors like
```
/workspace/srcdir/llvm-project-14.0.6.src/libunwind/src/DwarfParser.hpp:675:66: error: expected ‘)’ before ‘PRIu64’
```
@giordano giordano force-pushed the aa/llvm-libunwind-14 branch from e59410e to 83aa2bc Compare December 30, 2022 21:44
@giordano
Copy link
Member

giordano commented Dec 30, 2022

License file is missing

Edit: you already fixed it ❤️

@ararslan
Copy link
Member Author

License file is missing

Should be fixed by 3ad149b#diff-3358a3924953c17aa8cedfd626863e654e065c5c0bc1f087fe462d13514c998aR63

@giordano giordano merged commit 65f4bb3 into master Dec 30, 2022
@giordano giordano deleted the aa/llvm-libunwind-14 branch December 30, 2022 21:53
@ararslan
Copy link
Member Author

@gbaraldi worth another try now I think 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants