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

Add LLVM patch #582

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Add LLVM patch #582

merged 1 commit into from
Mar 6, 2020

Conversation

Keno
Copy link
Contributor

@Keno Keno commented Mar 2, 2020

Adds the patch from JuliaLang/julia#34860.

@vchuravy
Copy link
Member

vchuravy commented Mar 2, 2020

Will this be backported to Julia 1.4? If so we need this for LLVM 8 as well.

@giordano
Copy link
Member

giordano commented Mar 3, 2020

Echoing here a comment from Slack: the directory L/LLVM/v9 should be moved to L/LLVM/LLVM@9 (or also L/LLVM/LLVM@v9 if you prefer), like the structure of OpenBLAS. This is the reason of the failure to upload the artifacts. No need to rename the other LLVM versions now, otherwise they'll trigger a rebuild.

@staticfloat
Copy link
Member

No need to rename the other LLVM versions now, otherwise they'll trigger a rebuild.

I'm going to push a commit to do the renames now, then cancel the resultant enormous CI job. That way we won't forget to do this in the future.

@giordano
Copy link
Member

giordano commented Mar 3, 2020

or use [skip ci] 😉

@Keno
Copy link
Contributor Author

Keno commented Mar 4, 2020

How do we move this forward now that the rename is done? Can I trigger CI again?

@giordano
Copy link
Member

giordano commented Mar 4, 2020

Yes, rename L/LLVM/v9 to L/LLVM/LLVM@9

@staticfloat
Copy link
Member

Only on win32:

[01:55:14] lib/liblldCOFF.a(Chunks.cpp.obj):Chunks.cpp:(.text$_ZNK3lld4coff15NonSectionChunk14getSectionNameEv+0x0): multiple definition of `lld::coff::NonSectionChunk::getSectionName() const'
[01:55:14] lib/liblldCOFF.a(Writer.cpp.obj):Writer.cpp:(.text$_ZNK3lld4coff15NonSectionChunk14getSectionNameEv+0x0): first defined here
[01:55:14] lib/liblldCOFF.a(DLL.cpp.obj):DLL.cpp:(.text$_ZNK3lld4coff15NonSectionChunk14getSectionNameEv+0x0): multiple definition of `lld::coff::NonSectionChunk::getSectionName() const'
[01:55:14] lib/liblldCOFF.a(Writer.cpp.obj):Writer.cpp:(.text$_ZNK3lld4coff15NonSectionChunk14getSectionNameEv+0x0): first defined here
[01:55:14] lib/liblldMachO.a(ArchHandler_arm64.cpp.obj):ArchHandler_arm64.cpp:(.text$_ZN3lld6mach_o11ArchHandler10createShimERNS0_9MachOFileEbRKNS_11DefinedAtomE+0x0): multiple definition of `lld::mach_o::ArchHandler::createShim(lld::mach_o::MachOFile&, bool, lld::DefinedAtom const&)'
[01:55:14] lib/liblldMachO.a(ArchHandler.cpp.obj):ArchHandler.cpp:(.text$_ZN3lld6mach_o11ArchHandler10createShimERNS0_9MachOFileEbRKNS_11DefinedAtomE+0x0): first defined here
[01:55:14] lib/liblldMachO.a(ArchHandler_x86.cpp.obj):ArchHandler_x86.cpp:(.text$_ZN3lld6mach_o11ArchHandler10createShimERNS0_9MachOFileEbRKNS_11DefinedAtomE+0x0): multiple definition of `lld::mach_o::ArchHandler::createShim(lld::mach_o::MachOFile&, bool, lld::DefinedAtom const&)'
[01:55:14] lib/liblldMachO.a(ArchHandler.cpp.obj):ArchHandler.cpp:(.text$_ZN3lld6mach_o11ArchHandler10createShimERNS0_9MachOFileEbRKNS_11DefinedAtomE+0x0): first defined here
[01:55:14] lib/liblldMachO.a(ArchHandler_x86_64.cpp.obj):ArchHandler_x86_64.cpp:(.text$_ZN3lld6mach_o11ArchHandler10createShimERNS0_9MachOFileEbRKNS_11DefinedAtomE+0x0): multiple definition of `lld::mach_o::ArchHandler::createShim(lld::mach_o::MachOFile&, bool, lld::DefinedAtom const&)'
[01:55:14] lib/liblldMachO.a(ArchHandler.cpp.obj):ArchHandler.cpp:(.text$_ZN3lld6mach_o11ArchHandler10createShimERNS0_9MachOFileEbRKNS_11DefinedAtomE+0x0): first defined here

@staticfloat
Copy link
Member

And only on -cxx11? That's gotta be a ccache error or something. I'll try re-running.

@staticfloat
Copy link
Member

Great. I'm gonna merge.

@staticfloat staticfloat merged commit 34ae02f into master Mar 6, 2020
@staticfloat staticfloat deleted the kf/llvmpatch branch March 6, 2020 00:31
vchuravy added a commit that referenced this pull request Mar 6, 2020
IanButterworth pushed a commit to IanButterworth/Yggdrasil that referenced this pull request Mar 15, 2020
IanButterworth pushed a commit to IanButterworth/Yggdrasil that referenced this pull request Mar 16, 2020
IanButterworth pushed a commit to IanButterworth/Yggdrasil that referenced this pull request Mar 19, 2020
vchuravy added a commit that referenced this pull request Mar 26, 2020
Co-authored-by: Ian <i.r.butterworth@gmail.com>
@giordano giordano added the julia 💜 ❤️ 💚 Builders and issues related to Julia and its dependencies label Sep 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
julia 💜 ❤️ 💚 Builders and issues related to Julia and its dependencies LLVM 🐉
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants