aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-01-17 17:29:21 -0500
committerAndrew Kelley <superjoe30@gmail.com>2018-01-17 17:29:21 -0500
commit4aed7ea6f89a091aede10ccf0fb45b3ce12c710d (patch)
tree1e29f13ad17bfc841c33f6ac3d0ccb092404f409 /CMakeLists.txt
parent48cd808185f54e935714539d101585a9a0a41673 (diff)
downloadzig-4aed7ea6f89a091aede10ccf0fb45b3ce12c710d.tar.gz
zig-4aed7ea6f89a091aede10ccf0fb45b3ce12c710d.zip
update embedded LLD to 6.0.0rc1
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt155
1 files changed, 99 insertions, 56 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd39dd30da..95796385ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,97 +64,118 @@ else()
include_directories(${LLVM_INCLUDE_DIRS})
include_directories(${CLANG_INCLUDE_DIRS})
set(EMBEDDED_LLD_LIB_SOURCES
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/Args.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/ErrorHandler.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/Memory.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/Reproduce.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/Strings.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/TargetOptionsCommandFlags.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/Threads.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/Common/Version.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/DefinedAtom.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Error.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/File.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/LinkingContext.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Reader.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Resolver.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/SymbolTable.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Writer.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/FileArchive.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ShimPass.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/StubsPass.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/FileArchive.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/TargetOptionsCommandFlags.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/File.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Error.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/SymbolTable.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Reader.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Reproduce.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Writer.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/LinkingContext.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Resolver.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/DefinedAtom.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp"
)
set(EMBEDDED_LLD_ELF_SOURCES
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ScriptLexer.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/AArch64ErrataFix.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AArch64.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AMDGPU.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/PPC.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/ARM.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AVR.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/SPARCV9.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/Mips.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AArch64.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/X86_64.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/PPC64.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/MipsArchTree.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/PPC.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/PPC64.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/SPARCV9.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/X86.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/GdbIndex.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/X86_64.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Driver.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Relocations.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Error.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/LTO.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Strings.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ScriptParser.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/MarkLive.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/SyntheticSections.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/SymbolTable.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/LinkerScript.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/DriverUtils.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/EhFrame.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Target.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/Filesystem.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/OutputSections.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Symbols.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/GdbIndex.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/ICF.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/InputFiles.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Thunks.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/DriverUtils.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Writer.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/InputSection.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/LTO.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/LinkerScript.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/ELF/MapFile.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/MarkLive.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/OutputSections.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Relocations.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ScriptLexer.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ScriptParser.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Strings.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/SymbolTable.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Symbols.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/SyntheticSections.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Target.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Thunks.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Writer.cpp"
)
+
set(EMBEDDED_LLD_COFF_SOURCES
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Chunks.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/DLL.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/Driver.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Chunks.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/PDB.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Error.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DriverUtils.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/ICF.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/InputFiles.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/LTO.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Strings.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/MapFile.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/MarkLive.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/MinGW.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/PDB.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Strings.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/SymbolTable.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/Symbols.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/ICF.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/InputFiles.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DriverUtils.cpp"
"${CMAKE_SOURCE_DIR}/deps/lld/COFF/Writer.cpp"
- "${CMAKE_SOURCE_DIR}/deps/lld/COFF/MapFile.cpp"
+ )
+ set(EMBEDDED_LLD_MINGW_SOURCES
+ "${CMAKE_SOURCE_DIR}/deps/lld/MinGW/Driver.cpp"
+ )
+ set(EMBEDDED_LLD_WASM_SOURCES
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Driver.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/InputFiles.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/InputSegment.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/OutputSections.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Symbols.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/SymbolTable.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Writer.cpp"
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm/WriterUtils.cpp"
)
add_library(embedded_lld_lib ${EMBEDDED_LLD_LIB_SOURCES})
add_library(embedded_lld_elf ${EMBEDDED_LLD_ELF_SOURCES})
add_library(embedded_lld_coff ${EMBEDDED_LLD_COFF_SOURCES})
+ add_library(embedded_lld_mingw ${EMBEDDED_LLD_MINGW_SOURCES})
+ add_library(embedded_lld_wasm ${EMBEDDED_LLD_WASM_SOURCES})
if(MSVC)
set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -D_CRT_SECURE_NO_WARNINGS /w")
else()
@@ -172,6 +193,14 @@ else()
COMPILE_FLAGS ${ZIG_LLD_COMPILE_FLAGS}
LINK_FLAGS " "
)
+ set_target_properties(embedded_lld_mingw PROPERTIES
+ COMPILE_FLAGS ${ZIG_LLD_COMPILE_FLAGS}
+ LINK_FLAGS " "
+ )
+ set_target_properties(embedded_lld_wasm PROPERTIES
+ COMPILE_FLAGS ${ZIG_LLD_COMPILE_FLAGS}
+ LINK_FLAGS " "
+ )
target_include_directories(embedded_lld_lib PUBLIC
"${CMAKE_SOURCE_DIR}/deps/lld/include"
"${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
@@ -188,13 +217,27 @@ else()
"${CMAKE_SOURCE_DIR}/deps/lld-prebuilt/COFF"
"${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
)
+ target_include_directories(embedded_lld_mingw PUBLIC
+ "${CMAKE_SOURCE_DIR}/deps/lld/MinGW"
+ "${CMAKE_SOURCE_DIR}/deps/lld/include"
+ "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt/MinGW"
+ "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
+ )
+ target_include_directories(embedded_lld_wasm PUBLIC
+ "${CMAKE_SOURCE_DIR}/deps/lld/wasm"
+ "${CMAKE_SOURCE_DIR}/deps/lld/include"
+ "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt/wasm"
+ "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
+ )
set(LLD_INCLUDE_DIRS "")
set(LLD_LIBRARIES
embedded_lld_elf
embedded_lld_coff
+ embedded_lld_mingw
+ embedded_lld_wasm
embedded_lld_lib
)
- install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
+ install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
endif()
# No patches have been applied to SoftFloat-3d