Merge commit '753d4bc57147' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 80100dfc6c67 · 2025-11-06T06:51:49.000-08:00
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
@@ -54,8 +54,6 @@ using llvm::support::endian::read32le;
 using llvm::support::endian::write32le;
 using llvm::support::endian::write64le;
 
-constexpr size_t MergeNoTailSection::numShards;
-
 static uint64_t readUint(Ctx &ctx, uint8_t *buf) {
   return ctx.arg.is64 ? read64(ctx, buf) : read32(ctx, buf);
 }

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ using llvm::support::endian::read32le;`
`54`	`54`	`using llvm::support::endian::write32le;`
`55`	`55`	`using llvm::support::endian::write64le;`
`56`	`56`
`57`		`-constexpr size_t MergeNoTailSection::numShards;`
`58`		`-`
`59`	`57`	`static uint64_t readUint(Ctx &ctx, uint8_t *buf) {`
`60`	`58`	`return ctx.arg.is64 ? read64(ctx, buf) : read32(ctx, buf);`
`61`	`59`	`}`