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

compiler-rt: apply armv6l patches to llvm >= 15 where applicable #333922

Merged
merged 1 commit into from
Sep 15, 2024

Conversation

symphorien
Copy link
Member

Fixes armv6 build of compiler-rt.

the patches were written for
#205176 but not kept for llvm >= 15

cc @lopsided98 as the author of #205176

tested by cross compiling only.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Aug 11, 2024
@RossComputerGuy
Copy link
Member

Are all the patch files copies of each other?

@symphorien
Copy link
Member Author

no there are 3 versions of it: the original for llvm <= 14, an intermediary one for 15 16 17 18 and the latest one for 19 and 20.

@RossComputerGuy
Copy link
Member

intermediary one for 15 16 17 18 and the latest one for 19 and 20.

Wdym by intermediary? Are the ones for 15+ the same exact file?

@symphorien
Copy link
Member Author

I mean nothing special by intermediary.
There are three distinct patches.

$  md5sum pkgs/development/compilers/llvm/**/armv6-scudo-libatomic.patch
e179fdad601bc6cb60cf7a2587354b6b  pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch
e179fdad601bc6cb60cf7a2587354b6b  pkgs/development/compilers/llvm/16/compiler-rt/armv6-scudo-libatomic.patch
e179fdad601bc6cb60cf7a2587354b6b  pkgs/development/compilers/llvm/17/compiler-rt/armv6-scudo-libatomic.patch
e179fdad601bc6cb60cf7a2587354b6b  pkgs/development/compilers/llvm/18/compiler-rt/armv6-scudo-libatomic.patch
ba8b03aef2c271c484275408c1a30b33  pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch
f2e6764468ceca1f4d5b29fa16b92553  pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-libatomic.patch
ba8b03aef2c271c484275408c1a30b33  pkgs/development/compilers/llvm/git/compiler-rt/armv6-scudo-libatomic.patch

@RossComputerGuy
Copy link
Member

Yeah, I was just wondering because there's work to slim down our patches by removing duplicates and changing getVersionFile to branch based on the file path and version.

the patches were written for
NixOS#205176 but not kept for llvm >= 15
@symphorien
Copy link
Member Author

ping @RossComputerGuy

@RossComputerGuy
Copy link
Member

Please update getVersionFile to handle duplicates and remove duplicate patches. The PR which implemented that was merged so you'll have to rebase.

@symphorien
Copy link
Member Author

done

@symphorien symphorien merged commit 07c8996 into NixOS:staging Sep 15, 2024
22 checks passed
@symphorien symphorien deleted the compiler_rt_armv6l branch September 15, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants