Illumos retarget#67
Merged
alexey-milovidov merged 3 commits intoClickHouse:ClickHouse/release-21.xfrom Feb 6, 2026
Merged
Conversation
libc++ changes: - Add __sun to pthread platforms and rune table providers. - Add illumos ctype mask definitions with non-overlapping __regex_word. - Use musl locale shim for missing *_l functions. - Skip overloads already defined in illumos stdlib. - Fix conflicting __sentinel, _E1-_E24 macros. LLVM changes: - Fix conflicting FS, CS/CE macros. - Use std::fabs instead of std::abs for float in SampleProfileProbe. Part of llvm#23777.
Illumos uses PT_SUNW_EH_FRAME and PT_SUNW_UNWIND program header types instead of PT_GNU_EH_FRAME for exception handling frames. This patch checks if the illumos headers are defined, and checks the appropriate fields in the ELF header if so. Based on https://github.com/oxidecomputer/garbage-compactor/blob/master/clickhouse/patches/0020-Use-libunwind-on-illumos.patch. Part of ClickHouse/ClickHouse#23777. Note: we'll submit this to upstream llvm as well.
In ClickHouse#63, we checked for illumos-specific EH headers and used them if defined. But freebsd also defines some of these headers (but not all) for compatibility. This patch caused clickhouse builds to break on freebsd. This patch fixes the regression by checking for both EH headers, so that we fall through to the default case on freebsd.
Member
|
Can we please upstream all of this stuff. I don't feel good if ClickHouse uses a non-mainstream branch of the very fundamental LLVM library (we don't have the expertise to fix something if something breaks). |
Member
|
Ref: llvm#176988 |
alexey-milovidov
merged commit e8e0c06
into
ClickHouse:ClickHouse/release-21.x
2 checks passed
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick illumos portability fixes already merged into the default
clickhouse1branch and target theClickHouse/release-21.xbranch as described in ClickHouse/ClickHouse#94285 (comment). I'll update that PR to point to this branch next.cc @rschu1ze