pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/llvm
Module Name: pkgsrc
Committed By: adam
Date: Sun Oct 11 05:35:55 UTC 2026
Modified Files:
pkgsrc/lang/llvm: distinfo
pkgsrc/lang/llvm/patches: patch-lib_ObjCopy_MachO_MachOWriter.cpp
Removed Files:
pkgsrc/lang/llvm/patches: patch-include_llvm_CodeGen_RDFRegisters.h
Log Message:
llvm: update patches
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/lang/llvm/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/llvm/patches/patch-include_llvm_CodeGen_RDFRegisters.h
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/lang/llvm/patches/patch-lib_ObjCopy_MachO_MachOWriter.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/llvm/distinfo
diff -u pkgsrc/lang/llvm/distinfo:1.52 pkgsrc/lang/llvm/distinfo:1.53
--- pkgsrc/lang/llvm/distinfo:1.52 Sun Oct 11 05:28:12 2026
+++ pkgsrc/lang/llvm/distinfo Sun Oct 11 05:35:54 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2026/10/11 05:28:12 adam Exp $
+$NetBSD: distinfo,v 1.53 2026/10/11 05:35:54 adam Exp $
BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
@@ -7,8 +7,7 @@ SHA1 (patch-CMakeLists.txt) = e7ed5046d2
SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
SHA1 (patch-cmake_modules_AddLLVM.cmake) = 8247115b19af5c19399a94f64ef65e2fbef62b9b
SHA1 (patch-include_llvm-c_DataTypes.h) = ff547cae5bdf90c5a1371b9eb196e7537a03b18d
-SHA1 (patch-include_llvm_CodeGen_RDFRegisters.h) = 906be4b85954ca4a1dc4b34946a7bfcbf6c4758a
SHA1 (patch-lib_ObjCopy_MachO_MachOLayoutBuilder.cpp) = ecfffdb53cbc53fbb304f478fb908bfe703dfa2b
-SHA1 (patch-lib_ObjCopy_MachO_MachOWriter.cpp) = 73e6d111214cc8a8928457e2efdd1775ede27be4
+SHA1 (patch-lib_ObjCopy_MachO_MachOWriter.cpp) = c0ad0d6e2e084045cccaf3619e7c32ccc1b1f842
SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 92558f2d7d87b7a26f7f3a2b3b3dc539ae13e672
SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = be83a1ac3df2b28d295d2693a35f2e65d2a34a73
Index: pkgsrc/lang/llvm/patches/patch-lib_ObjCopy_MachO_MachOWriter.cpp
diff -u pkgsrc/lang/llvm/patches/patch-lib_ObjCopy_MachO_MachOWriter.cpp:1.1 pkgsrc/lang/llvm/patches/patch-lib_ObjCopy_MachO_MachOWriter.cpp:1.2
--- pkgsrc/lang/llvm/patches/patch-lib_ObjCopy_MachO_MachOWriter.cpp:1.1 Wed Sep 16 11:00:39 2026
+++ pkgsrc/lang/llvm/patches/patch-lib_ObjCopy_MachO_MachOWriter.cpp Sun Oct 11 05:35:54 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_ObjCopy_MachO_MachOWriter.cpp,v 1.1 2026/09/16 11:00:39 tnn Exp $
+$NetBSD: patch-lib_ObjCopy_MachO_MachOWriter.cpp,v 1.2 2026/10/11 05:35:54 adam Exp $
Fix llvm-objcopy producing mis-aligned __LINKEDIT segment.
ld on xcode 27 rejects such dylibs. This breaks notably rustc.
Patch via https://github.com/llvm/llvm-project/pull/203680
---- lib/ObjCopy/MachO/MachOWriter.cpp.orig 2025-12-12 10:35:47.000000000 +0000
+--- lib/ObjCopy/MachO/MachOWriter.cpp.orig 2026-06-15 22:33:53.000000000 +0000
+++ lib/ObjCopy/MachO/MachOWriter.cpp
-@@ -24,6 +24,12 @@
+@@ -24,6 +24,12 @@ using namespace llvm;
using namespace llvm::objcopy::macho;
using namespace llvm::support::endian;
@@ -19,7 +19,7 @@ Patch via https://github.com/llvm/llvm-p
size_t MachOWriter::headerSize() const {
return Is64Bit ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
}
-@@ -55,29 +61,34 @@
+@@ -55,29 +61,34 @@ size_t MachOWriter::totalSize() const {
O.LoadCommands[*O.DyLdInfoCommandIndex]
.MachOLoadCommand.dyld_info_command_data;
if (DyLdInfoCommand.rebase_off) {
@@ -59,70 +59,70 @@ Patch via https://github.com/llvm/llvm-p
"Incorrect trie size");
Ends.push_back(DyLdInfoCommand.export_off + DyLdInfoCommand.export_size);
}
-@@ -320,7 +331,8 @@
+@@ -320,7 +331,8 @@ void MachOWriter::writeRebaseInfo() {
O.LoadCommands[*O.DyLdInfoCommandIndex]
.MachOLoadCommand.dyld_info_command_data;
- char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.rebase_off;
+ char *Out = Buf->getBufferStart() + DyLdInfoCommand.rebase_off;
- assert((DyLdInfoCommand.rebase_size == O.Rebases.Opcodes.size()) &&
+ assert((DyLdInfoCommand.rebase_size ==
+ paddedLinkEditEntrySize(O.Rebases.Opcodes.size(), Is64Bit)) &&
"Incorrect rebase opcodes size");
memcpy(Out, O.Rebases.Opcodes.data(), O.Rebases.Opcodes.size());
}
-@@ -332,7 +344,8 @@
+@@ -332,7 +344,8 @@ void MachOWriter::writeBindInfo() {
O.LoadCommands[*O.DyLdInfoCommandIndex]
.MachOLoadCommand.dyld_info_command_data;
- char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.bind_off;
+ char *Out = Buf->getBufferStart() + DyLdInfoCommand.bind_off;
- assert((DyLdInfoCommand.bind_size == O.Binds.Opcodes.size()) &&
+ assert((DyLdInfoCommand.bind_size ==
+ paddedLinkEditEntrySize(O.Binds.Opcodes.size(), Is64Bit)) &&
"Incorrect bind opcodes size");
memcpy(Out, O.Binds.Opcodes.data(), O.Binds.Opcodes.size());
}
-@@ -344,7 +357,8 @@
+@@ -344,7 +357,8 @@ void MachOWriter::writeWeakBindInfo() {
O.LoadCommands[*O.DyLdInfoCommandIndex]
.MachOLoadCommand.dyld_info_command_data;
- char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.weak_bind_off;
+ char *Out = Buf->getBufferStart() + DyLdInfoCommand.weak_bind_off;
- assert((DyLdInfoCommand.weak_bind_size == O.WeakBinds.Opcodes.size()) &&
+ assert((DyLdInfoCommand.weak_bind_size ==
+ paddedLinkEditEntrySize(O.WeakBinds.Opcodes.size(), Is64Bit)) &&
"Incorrect weak bind opcodes size");
memcpy(Out, O.WeakBinds.Opcodes.data(), O.WeakBinds.Opcodes.size());
}
-@@ -356,7 +370,8 @@
+@@ -356,7 +370,8 @@ void MachOWriter::writeLazyBindInfo() {
O.LoadCommands[*O.DyLdInfoCommandIndex]
.MachOLoadCommand.dyld_info_command_data;
- char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.lazy_bind_off;
+ char *Out = Buf->getBufferStart() + DyLdInfoCommand.lazy_bind_off;
- assert((DyLdInfoCommand.lazy_bind_size == O.LazyBinds.Opcodes.size()) &&
+ assert((DyLdInfoCommand.lazy_bind_size ==
+ paddedLinkEditEntrySize(O.LazyBinds.Opcodes.size(), Is64Bit)) &&
"Incorrect lazy bind opcodes size");
memcpy(Out, O.LazyBinds.Opcodes.data(), O.LazyBinds.Opcodes.size());
}
-@@ -368,7 +383,8 @@
+@@ -368,7 +383,8 @@ void MachOWriter::writeExportInfo() {
O.LoadCommands[*O.DyLdInfoCommandIndex]
.MachOLoadCommand.dyld_info_command_data;
- char *Out = (char *)Buf->getBufferStart() + DyLdInfoCommand.export_off;
+ char *Out = Buf->getBufferStart() + DyLdInfoCommand.export_off;
- assert((DyLdInfoCommand.export_size == O.Exports.Trie.size()) &&
+ assert((DyLdInfoCommand.export_size ==
+ paddedLinkEditEntrySize(O.Exports.Trie.size(), Is64Bit)) &&
"Incorrect export trie size");
memcpy(Out, O.Exports.Trie.data(), O.Exports.Trie.size());
}
-@@ -398,7 +414,8 @@
+@@ -398,7 +414,8 @@ void MachOWriter::writeLinkData(std::opt
const MachO::linkedit_data_command &LinkEditDataCommand =
O.LoadCommands[*LCIndex].MachOLoadCommand.linkedit_data_command_data;
- char *Out = (char *)Buf->getBufferStart() + LinkEditDataCommand.dataoff;
+ char *Out = Buf->getBufferStart() + LinkEditDataCommand.dataoff;
- assert((LinkEditDataCommand.datasize == LD.Data.size()) &&
+ assert((LinkEditDataCommand.datasize ==
+ paddedLinkEditEntrySize(LD.Data.size(), Is64Bit)) &&
"Incorrect data size");
memcpy(Out, LD.Data.data(), LD.Data.size());
}
-@@ -575,7 +592,8 @@
+@@ -575,7 +592,8 @@ void MachOWriter::writeExportsTrieData()
O.LoadCommands[*O.ExportsTrieCommandIndex]
.MachOLoadCommand.linkedit_data_command_data;
- char *Out = (char *)Buf->getBufferStart() + ExportsTrieCmd.dataoff;
+ char *Out = Buf->getBufferStart() + ExportsTrieCmd.dataoff;
- assert((ExportsTrieCmd.datasize == O.Exports.Trie.size()) &&
+ assert((ExportsTrieCmd.datasize ==
+ paddedLinkEditEntrySize(O.Exports.Trie.size(), Is64Bit)) &&
Home |
Main Index |
Thread Index |
Old Index