Skip to content

build: inline aarch64 atomics in musl C code instead of linking libgcc #619

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.

Sign up for GitHub

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

Open
adriencaccia wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

build: inline aarch64 atomics in musl C code instead of linking libgcc #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ CPATH = { value = "crates/memtrack/musl", relative = true }
# have to be added back, last so they never shadow the toolchain's own. Scoped
# per target: cc-rs looks up `CFLAGS_<target>` before `CFLAGS`, and libbpf-sys
# builds zlib, elfutils and libbpf from `cc::Tool::cflags_env()`.
#
# rustc links with `-nodefaultlibs`, so libgcc's outline-atomic helpers that
# gcc calls by default on aarch64 are missing: inline the atomics instead. A
# `-lgcc` in `target.<triple>.rustflags` would be dropped whenever `RUSTFLAGS`
# is set in the environment.
CFLAGS_x86_64_unknown_linux_musl = "-idirafter /usr/include/x86_64-linux-gnu -idirafter /usr/include"
CFLAGS_aarch64_unknown_linux_musl = "-idirafter /usr/include/aarch64-linux-gnu -idirafter /usr/include"

# rustc links with `-nodefaultlibs`; libbpf's C code needs the outline-atomic
# helpers from libgcc on aarch64.
[target.aarch64-unknown-linux-musl]
rustflags = ["-C", "link-arg=-lgcc"]
CFLAGS_aarch64_unknown_linux_musl = "-mno-outline-atomics -idirafter /usr/include/aarch64-linux-gnu -idirafter /usr/include"
Loading