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

ostree: Use libcc for compiler runtime when using glibc for system #1020

Merged
merged 1 commit into from
Oct 18, 2024

Conversation

kraj
Copy link
Owner

@kraj kraj commented Oct 16, 2024

glibc static library expects builtins from libgcc which may not exist in compiler-rt, therefore use libgcc explicitly.


Contributor checklist

Reviewer Guidelines

  • When submitting a review, please pick:
    • 'Approve' if this change would be acceptable in the codebase (even if there are minor or cosmetic tweaks that could be improved).
    • 'Request Changes' if this change would not be acceptable in our codebase (e.g. bugs, changes that will make development harder in future, security/performance issues, etc).
    • 'Comment' if you don't feel you have enough information to decide either way (e.g. if you have major questions, or you don't understand the context of the change sufficiently to fully review yourself, but want to make a comment)

@@ -398,6 +397,7 @@ COMPILER_RT:pn-mpich:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
COMPILER_RT:pn-aufs-util:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
COMPILER_RT:pn-tsocks:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
COMPILER_RT:pn-ostree:toolchain-clang:libc-glibc = "-rtlib=libgcc --unwindlib=libgcc"
Copy link
Contributor

@quaresmajose quaresmajose Oct 16, 2024

Choose a reason for hiding this comment

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

I have used that and we only need it for x86-64, for reference I foundriesio/meta-lmp@0abb08c

Copy link
Owner Author

Choose a reason for hiding this comment

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

nice !. Since you have done this and perhaps tested it a bit longer, would you mind proposing it here ? I would like to include those changes instead

glibc static library expects builtins from libgcc which may not exist
in compiler-rt, therefore use libgcc explicitly.

Now that static is enabled by default in packageconfig

Fix is taken from [1]

[1] foundriesio/meta-lmp@0abb08c

Signed-off-by: Khem Raj <raj.khem@gmail.com>
@kraj kraj merged commit ede1c06 into kraj:master Oct 18, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants