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

llvmPackages_15: init at 15.0.2 #194781

Closed
wants to merge 2 commits into from
Closed

Conversation

lovesegfault
Copy link
Member

Description of changes

This was pretty smooth, but the second commit I think deserves some attention. I
needed to do that since setting it to libcxxabi as we were doing before was
causing CMake to fail during the configure step.

I think what I did is fine, since all the headersOnly build does is copy files
around, but I'd like that checked by someone who understands our LLVM builds
better than me.

I'll bump llvmPackages_latest in another PR to avoid mass rebuilds.

  • llvmPackages_15: init at 15.0.2
  • llvmPackages_15.libcxx: use LIBCXX_CXX_ABI=none when building headers only
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.

@zowoq
Copy link
Contributor

zowoq commented Oct 6, 2022

#194634

rm test/tools/dsymutil/X86/op-convert.test
rm test/tools/gold/X86/split-dwarf.ll
rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s
rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s
rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s
rm test/CodeGen/RISCV/rv32zbp.ll
rm test/CodeGen/RISCV/rv64zbp.ll

These fail on armv7l-linux:

llvm> ********************
llvm> ********************
llvm> Failed Tests (2):
llvm>   LLVM :: CodeGen/RISCV/rv32zbp.ll
llvm>   LLVM :: CodeGen/RISCV/rv64zbp.ll
llvm> Testing Time: 158.23s
llvm>   Skipped          :    20
llvm>   Unsupported      :  1596
llvm>   Passed           : 47426
llvm>   Expectedly Failed:   161
llvm>   Failed           :     2
llvm> 1 warning(s) in tests
llvm> make[3]: *** [CMakeFiles/check-all.dir/build.make:71: CMakeFiles/check-all] Error 1
llvm> make[3]: Leaving directory '/build/llvm-src-15.0.2/llvm/build'
llvm> make[2]: *** [CMakeFiles/Makefile2:9246: CMakeFiles/check-all.dir/all] Error 2
llvm> make[2]: Leaving directory '/build/llvm-src-15.0.2/llvm/build'
llvm> make[1]: *** [CMakeFiles/Makefile2:9253: CMakeFiles/check-all.dir/rule] Error 2
llvm> make[1]: Leaving directory '/build/llvm-src-15.0.2/llvm/build'
llvm> make: *** [Makefile:228: check-all] Error 2

./normalize-var.patch
] # Prevent a compilation error on darwin
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
Copy link
Contributor

Choose a reason for hiding this comment

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

This patch is not applying and not needed:

compiler-rt-libc> source root is compiler-rt-src-15.0.2/compiler-rt
compiler-rt-libc> patching sources
compiler-rt-libc> applying patch /nix/store/qvyl9jgm1a1mlix44qbsgrd1ipwciamk-X86-support-extension.patch
compiler-rt-libc> patching file lib/builtins/CMakeLists.txt
compiler-rt-libc> Hunk #1 succeeded at 355 (offset 7 lines).
compiler-rt-libc> Hunk #2 succeeded at 735 with fuzz 2 (offset 8 lines).
compiler-rt-libc> applying patch /nix/store/8z4wq03gvjdyvpldnrl7x1sy14qfk1pk-gnu-install-dirs.patch
compiler-rt-libc> patching file cmake/base-config-ix.cmake
compiler-rt-libc> applying patch /nix/store/x0137mdpq76zfp2xvn3ncawys2g4c93i-normalize-var.patch
compiler-rt-libc> patching file cmake/Modules/CompilerRTUtils.cmake
compiler-rt-libc> Hunk #1 succeeded at 392 with fuzz 2 (offset 90 lines).
compiler-rt-libc> applying patch /nix/store/jd7mnr62kxgks1rwnrrfg22vwnggkpxf-armv7l.patch
compiler-rt-libc> patching file cmake/builtin-config-ix.cmake
compiler-rt-libc> Hunk #1 FAILED at 24.
compiler-rt-libc> 1 out of 1 hunk FAILED -- saving rejects to file cmake/builtin-config-ix.cmake.rej
compiler-rt-libc> patching file lib/builtins/CMakeLists.txt
compiler-rt-libc> Hunk #1 succeeded at 569 with fuzz 2 (offset 95 lines).
compiler-rt-libc> Hunk #2 FAILED at 596.
compiler-rt-libc> 1 out of 2 hunks FAILED -- saving rejects to file lib/builtins/CMakeLists.txt.rej

@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants