Skip to content

llvmPackages_11: Fix cross-compilation for i686 #196008

Merged
7c6f434c merged 3 commits intoNixOS:stagingfrom
peperunas:llvm-i686
Oct 22, 2022
Merged

llvmPackages_11: Fix cross-compilation for i686 #196008
7c6f434c merged 3 commits intoNixOS:stagingfrom
peperunas:llvm-i686

Conversation

@peperunas
Copy link
Copy Markdown
Contributor

@peperunas peperunas commented Oct 14, 2022

Expose ix86 family builtins.

Co-Authored-By: John Ericson git@JohnEricson.me

Description of changes

This issue is part of a series of bugfixes to improve the i686 cross-compilation pipeline.

Tracking issue: #195967

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@peperunas @Ericson2314
llvmPackages_11.compiler-rt: Add i486, i586, i686 to X86 family. Expo…
5989c9d 
…se ix86 family builtins.

Co-Authored-By: John Ericson <git@JohnEricson.me>
@peperunas peperunas mentioned this pull request Oct 14, 2022
Open
@ofborg ofborg bot requested review from 7c6f434c, dtzWill, lovek323 and primeos October 14, 2022 16:47
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Oct 14, 2022
@peperunas peperunas changed the title llvmPackages_11.compiler-rt: Add i486, i586, i686 to X86 family. llvmPackages_11: Fix cross-compilation for i686 Oct 14, 2022
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Oct 14, 2022
@lovesegfault
Copy link
Copy Markdown
Member

lovesegfault commented Oct 14, 2022

This has to target staging due to the mass rebuilds.

@peperunas peperunas changed the base branch from master to staging October 15, 2022 15:37
@7c6f434c 7c6f434c merged commit 2c943d3 into NixOS:staging Oct 22, 2022
@alyssais
Copy link
Copy Markdown
Member

alyssais commented Nov 7, 2022

2000ae5 has broken rust-bindgen:

% bindgen /tmp/bind.h
/tmp/bind.h:1:10: fatal error: 'stdlib.h' file not found
/tmp/bind.h:1:10: fatal error: 'stdlib.h' file not found, err: true
thread 'main' panicked at 'Unable to generate bindings: ()', src/main.rs:52:36
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

(bind.h just contains #include <stdlib.h>.)

@alyssais alyssais mentioned this pull request Nov 10, 2022
Merged
13 tasks
@alyssais
Copy link
Copy Markdown
Member

alyssais commented Nov 10, 2022

Proposing revert of the problematic commit in #200587.

@Ericson2314
Copy link
Copy Markdown
Member

Ericson2314 commented Nov 10, 2022

We should try to not let the LLVMs drift apart with this. We probably should also look into having upstream support the other i.86 ones.

@alyssais
Copy link
Copy Markdown
Member

alyssais commented Nov 11, 2022

Yeah, that was something else that worried me when I saw this PR. Changes like this need to be applied to all applicable LLVM versions.

@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@lovek323 lovek323 Awaiting requested review from lovek323

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@primeos primeos Awaiting requested review from primeos

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@peperunas @lovesegfault @alyssais @Ericson2314 @7c6f434c @rrbutani