git: 3525c619abdb - main - Fix building with LLVM_BINUTILS_BOOSTRAP but without CLANG_BOOTSTRAP

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alex Richardson <arichardson_at_FreeBSD.org>
Date: Tue, 26 May 2026 21:23:04 UTC
The branch main has been updated by arichardson:

URL: https://cgit.FreeBSD.org/src/commit/?id=3525c619abdb646601e74194a6e15e8407a677da

commit 3525c619abdb646601e74194a6e15e8407a677da
Author:     Alex Richardson <arichardson@FreeBSD.org>
AuthorDate: 2026-05-26 19:38:58 +0000
Commit:     Alex Richardson <arichardson@FreeBSD.org>
CommitDate: 2026-05-26 19:38:59 +0000

    Fix building with LLVM_BINUTILS_BOOSTRAP but without CLANG_BOOTSTRAP
    
    Without this change I get various undefined symbol errors when trying to
    link llvm-nm and llvm-objcopy during the cross-tools stage.
    
    Test Plan: builds now
    Reviewed by:    dim, emaste
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D56873
---
 lib/clang/libllvm/Makefile | 70 +++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 327724bcb52e..ea90b37f8cbd 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -562,8 +562,8 @@ SRCS_EXT+=	DWARFLinker/Parallel/SyntheticTypeNameBuilder.cpp
 SRCS_EXT+=	DWARFLinker/Utils.cpp
 SRCS_EXT+=	DWP/DWP.cpp
 SRCS_EXT+=	DWP/DWPError.cpp
-SRCS_MIW+=	DebugInfo/BTF/BTFContext.cpp
-SRCS_MIW+=	DebugInfo/BTF/BTFParser.cpp
+SRCS_MIN+=	DebugInfo/BTF/BTFContext.cpp
+SRCS_MIN+=	DebugInfo/BTF/BTFParser.cpp
 SRCS_MIN+=	DebugInfo/CodeView/AppendingTypeTableBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CVSymbolVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CVTypeVisitor.cpp
@@ -607,7 +607,7 @@ SRCS_MIN+=	DebugInfo/CodeView/TypeTableCollection.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFAddressRange.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFCFIPrinter.cpp
+SRCS_MIN+=	DebugInfo/DWARF/DWARFCFIPrinter.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFContext.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
@@ -630,11 +630,11 @@ SRCS_MIN+=	DebugInfo/DWARF/DWARFListTable.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFUnit.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFUnwindTablePrinter.cpp
+SRCS_MIN+=	DebugInfo/DWARF/DWARFUnwindTablePrinter.cpp
 SRCS_MIN+=	DebugInfo/DWARF/DWARFVerifier.cpp
-SRCS_MIW+=	DebugInfo/DWARF/LowLevel/DWARFCFIProgram.cpp
+SRCS_MIN+=	DebugInfo/DWARF/LowLevel/DWARFCFIProgram.cpp
 SRCS_MIN+=	DebugInfo/DWARF/LowLevel/DWARFExpression.cpp
-SRCS_MIW+=	DebugInfo/DWARF/LowLevel/DWARFUnwindTable.cpp
+SRCS_MIN+=	DebugInfo/DWARF/LowLevel/DWARFUnwindTable.cpp
 SRCS_MIW+=	DebugInfo/GSYM/CallSiteInfo.cpp
 SRCS_MIW+=	DebugInfo/GSYM/DwarfTransformer.cpp
 SRCS_MIW+=	DebugInfo/GSYM/ExtractRanges.cpp
@@ -748,8 +748,8 @@ SRCS_EXT+=	DebugInfo/PDB/UDTLayout.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/DIPrinter.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/Markup.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/MarkupFilter.cpp
-SRCS_MIW+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
-SRCS_MIW+=	DebugInfo/Symbolize/Symbolize.cpp
+SRCS_MIN+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+SRCS_MIN+=	DebugInfo/Symbolize/Symbolize.cpp
 SRCS_MIW+=	Debuginfod/BuildIDFetcher.cpp
 SRCS_MIW+=	Debuginfod/Debuginfod.cpp
 SRCS_MIW+=	Debuginfod/HTTPClient.cpp
@@ -1077,28 +1077,28 @@ SRCS_EXT+=	MCA/Stages/RetireStage.cpp
 SRCS_EXT+=	MCA/Stages/Stage.cpp
 SRCS_EXT+=	MCA/Support.cpp
 SRCS_EXT+=	MCA/View.cpp
-SRCS_MIW+=	ObjCopy/Archive.cpp
-SRCS_MIW+=	ObjCopy/COFF/COFFObjcopy.cpp
-SRCS_MIW+=	ObjCopy/COFF/COFFObject.cpp
-SRCS_MIW+=	ObjCopy/COFF/COFFReader.cpp
-SRCS_MIW+=	ObjCopy/COFF/COFFWriter.cpp
-SRCS_MIW+=	ObjCopy/CommonConfig.cpp
-SRCS_MIW+=	ObjCopy/ConfigManager.cpp
-SRCS_MIW+=	ObjCopy/ELF/ELFObjcopy.cpp
-SRCS_MIW+=	ObjCopy/ELF/ELFObject.cpp
-SRCS_MIW+=	ObjCopy/MachO/MachOLayoutBuilder.cpp
-SRCS_MIW+=	ObjCopy/MachO/MachOObjcopy.cpp
-SRCS_MIW+=	ObjCopy/MachO/MachOObject.cpp
-SRCS_MIW+=	ObjCopy/MachO/MachOReader.cpp
-SRCS_MIW+=	ObjCopy/MachO/MachOWriter.cpp
-SRCS_MIW+=	ObjCopy/ObjCopy.cpp
-SRCS_MIW+=	ObjCopy/XCOFF/XCOFFObjcopy.cpp
-SRCS_MIW+=	ObjCopy/XCOFF/XCOFFReader.cpp
-SRCS_MIW+=	ObjCopy/XCOFF/XCOFFWriter.cpp
-SRCS_MIW+=	ObjCopy/wasm/WasmObjcopy.cpp
-SRCS_MIW+=	ObjCopy/wasm/WasmObject.cpp
-SRCS_MIW+=	ObjCopy/wasm/WasmReader.cpp
-SRCS_MIW+=	ObjCopy/wasm/WasmWriter.cpp
+SRCS_MIN+=	ObjCopy/Archive.cpp
+SRCS_MIN+=	ObjCopy/COFF/COFFObjcopy.cpp
+SRCS_MIN+=	ObjCopy/COFF/COFFObject.cpp
+SRCS_MIN+=	ObjCopy/COFF/COFFReader.cpp
+SRCS_MIN+=	ObjCopy/COFF/COFFWriter.cpp
+SRCS_MIN+=	ObjCopy/CommonConfig.cpp
+SRCS_MIN+=	ObjCopy/ConfigManager.cpp
+SRCS_MIN+=	ObjCopy/ELF/ELFObjcopy.cpp
+SRCS_MIN+=	ObjCopy/ELF/ELFObject.cpp
+SRCS_MIN+=	ObjCopy/MachO/MachOLayoutBuilder.cpp
+SRCS_MIN+=	ObjCopy/MachO/MachOObjcopy.cpp
+SRCS_MIN+=	ObjCopy/MachO/MachOObject.cpp
+SRCS_MIN+=	ObjCopy/MachO/MachOReader.cpp
+SRCS_MIN+=	ObjCopy/MachO/MachOWriter.cpp
+SRCS_MIN+=	ObjCopy/ObjCopy.cpp
+SRCS_MIN+=	ObjCopy/XCOFF/XCOFFObjcopy.cpp
+SRCS_MIN+=	ObjCopy/XCOFF/XCOFFReader.cpp
+SRCS_MIN+=	ObjCopy/XCOFF/XCOFFWriter.cpp
+SRCS_MIN+=	ObjCopy/wasm/WasmObjcopy.cpp
+SRCS_MIN+=	ObjCopy/wasm/WasmObject.cpp
+SRCS_MIN+=	ObjCopy/wasm/WasmReader.cpp
+SRCS_MIN+=	ObjCopy/wasm/WasmWriter.cpp
 SRCS_MIN+=	Object/Archive.cpp
 SRCS_MIN+=	Object/ArchiveWriter.cpp
 SRCS_MIN+=	Object/Binary.cpp
@@ -1115,7 +1115,7 @@ SRCS_MIN+=	Object/IRObjectFile.cpp
 SRCS_MIN+=	Object/IRSymtab.cpp
 SRCS_MIN+=	Object/MachOObjectFile.cpp
 SRCS_MIN+=	Object/MachOUniversal.cpp
-SRCS_MIW+=	Object/MachOUniversalWriter.cpp
+SRCS_MIN+=	Object/MachOUniversalWriter.cpp
 SRCS_MIN+=	Object/Minidump.cpp
 SRCS_MIN+=	Object/ModuleSymbolTable.cpp
 SRCS_EXT+=	Object/Object.cpp
@@ -1124,12 +1124,12 @@ SRCS_MIN+=	Object/OffloadBinary.cpp
 SRCS_MIW+=	Object/OffloadBundle.cpp
 SRCS_MIN+=	Object/RecordStreamer.cpp
 SRCS_MIN+=	Object/RelocationResolver.cpp
-SRCS_MIW+=	Object/SymbolSize.cpp
+SRCS_MIN+=	Object/SymbolSize.cpp
 SRCS_MIN+=	Object/SymbolicFile.cpp
 SRCS_MIN+=	Object/TapiFile.cpp
 SRCS_MIN+=	Object/TapiUniversal.cpp
 SRCS_MIN+=	Object/WasmObjectFile.cpp
-SRCS_MIW+=	Object/WindowsMachineFlag.cpp
+SRCS_MIN+=	Object/WindowsMachineFlag.cpp
 SRCS_MIN+=	Object/WindowsResource.cpp
 SRCS_MIN+=	Object/XCOFFObjectFile.cpp
 SRCS_MIN+=	ObjectYAML/COFFYAML.cpp
@@ -1298,7 +1298,7 @@ SRCS_MIN+=	Support/OptimizedStructLayout.cpp
 SRCS_MIN+=	Support/OptionStrCmp.cpp
 SRCS_MIN+=	Support/Optional.cpp
 SRCS_MIN+=	Support/PGOOptions.cpp
-SRCS_MIW+=	Support/Parallel.cpp
+SRCS_MIN+=	Support/Parallel.cpp
 SRCS_MIN+=	Support/Path.cpp
 SRCS_MIN+=	Support/PluginLoader.cpp
 SRCS_MIN+=	Support/PrettyStackTrace.cpp
@@ -1849,7 +1849,7 @@ SRCS_MIN+=	TextAPI/TextStubCommon.cpp
 SRCS_MIN+=	TextAPI/TextStubV5.cpp
 SRCS_MIN+=	TextAPI/Utils.cpp
 SRCS_MIN+=	ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
-SRCS_MIW+=	ToolDrivers/llvm-lib/LibDriver.cpp
+SRCS_MIN+=	ToolDrivers/llvm-lib/LibDriver.cpp
 SRCS_MIN+=	Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp
 SRCS_MIN+=	Transforms/AggressiveInstCombine/TruncInstCombine.cpp
 SRCS_MIN+=	Transforms/CFGuard/CFGuard.cpp