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.

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

Jump to bottom

Fix more aarch64-linux stuff. Take 2 #2116

Merged
merged 48 commits into from
May 23, 2024
Merged

Fix more aarch64-linux stuff. Take 2 #2116

merged 48 commits into from
May 23, 2024

Conversation

angerman
Copy link
Collaborator

More breakage that came up when building kupo and ogmios for 8.10, and hydra for 9.6.

Still a few more bugs left.

@angerman angerman self-assigned this Nov 29, 2023
@domenkozar
Copy link
Contributor

Does this address:

> cp: cannot stat '_build/stageBoot/bin/genprimopcode': No such file or directory
       For full logs, run 'nix log /nix/store/bcp1z5q8h0841sqb98pip4nmym23n4xm-x86_64-unknown-linux-musl-ghc-9.6.4.drv'.

?

@angerman
Copy link
Collaborator Author

angerman commented Feb 5, 2024

Does this address:

> cp: cannot stat '_build/stageBoot/bin/genprimopcode': No such file or directory
       For full logs, run 'nix log /nix/store/bcp1z5q8h0841sqb98pip4nmym23n4xm-x86_64-unknown-linux-musl-ghc-9.6.4.drv'.

?

I would hope so, but apparently it's not.

@angerman angerman force-pushed the angerman/fix-aarch64-musl branch 2 times, most recently from f13724a to 926e28c Compare February 24, 2024 12:08
angerman and others added 25 commits February 26, 2024 03:50
@angerman
Fix ghc:-dynamic-system-linker for android
baf9679 
(cherry picked from commit 6c6c32b)
@angerman
Set -dynamic-system-linker if musl and not x86_64
7fdd675 
(cherry picked from commit 89b97d5)
@angerman
add parens
d9aa2d3
@angerman
Add iserv-syms.patch
5ab1d85
@angerman
Add iserv/proxy_args logic to linux as well (same as weindows)
893cf77
@angerman
Add keep cafs.
c5a8548
@angerman
bump flakes
ddc7583
@angerman
Let's try using it directly.
9806bd7
@angerman
cleanup
9db06d5
@angerman
bump iserv
378bafc
@hamishmack @angerman
ifdLevel 1
4bebd67
@hamishmack @angerman
ifdLevel 2
44c4a16
@hamishmack @angerman
ifdLevel 3
3feec6e
@angerman
Add static-external-plugin logic for cross compilers.
4819428
@angerman
Fix musl copy
8167144
@angerman
Fix x86_64-musl
928b0d8
@angerman
initial iserv-proxy
644564d
@angerman
Add deadbeef patches
b04fdf0
@angerman
Add pool allocator patch
a1b7204
@angerman
Drop duplicates.
1b3373f
@angerman
Fix alignment
d17ec60
@hamishmack @angerman
ifdLevel 0
670a0d3
@hamishmack @angerman
ifdLevel 1
8711455
@hamishmack @angerman
ifdLevel 2
0bbb09f
@hamishmack @angerman
ifdLevel 3
b98a468
@angerman angerman force-pushed the angerman/fix-aarch64-musl branch from 595d54f to cbe8f37 Compare February 26, 2024 07:29
angerman and others added 15 commits February 27, 2024 07:35
@angerman
Extend patch range to cover 8.10 as well
81eacab
@angerman
apparently this doesn't apply to 9.8 :(
5c4491b
@angerman
Sigh, ffs. gold still broken with the NCG.
d857ef7
@angerman
Reduce allocation to 512MB not 1G
5069d91
@angerman
Fix up pool allocator stuff.
af3a4a8
@angerman
From 8.10, not 9.10 🤦
9f55274
@hamishmack
rm -rf materialized/dummy-ghc
929fc64
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/fix-aarch6…
c8d55d0 
…4-musl

# Conflicts:
#	flake.lock
#	overlays/bootstrap.nix
@hamishmack
nix flake update iserv-proxy
a34601e
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/fix-aarch6…
ac1a04e 
…4-musl
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/fix-aarch6…
24fc6fa 
…4-musl
@hamishmack
Fix for non SECTION_POOL sections
3f16530
@hamishmack
Exclude pool related patches for non aarch64 target platforms
8975f35
@hamishmack
Avoid gold for llvm+musl builds
5661558
@hamishmack
Use +dynamic-system-linker for aarch64 -> aarch64 musl
a2612aa
@hamishmack hamishmack self-assigned this May 21, 2024
@hamishmack hamishmack marked this pull request as ready for review May 22, 2024 01:30
@hamishmack hamishmack merged commit bdffdcf into master May 23, 2024
474 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@angerman angerman

@hamishmack hamishmack

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@angerman @domenkozar @hamishmack