sync ports with The Matrix
This commit is contained in:
parent
9d4d2e721a
commit
79bc6d9d97
846 changed files with 10693 additions and 8131 deletions
|
@ -2,7 +2,7 @@ LLVM_MAJOR = 13
|
|||
LLVM_VERSION = ${LLVM_MAJOR}.0.0
|
||||
LLVM_PKGSPEC = >=13,<14
|
||||
|
||||
REVISION-main = 11
|
||||
REVISION-main = 13
|
||||
REVISION-lldb = 4
|
||||
REVISION-python = 3
|
||||
|
||||
|
|
|
@ -4,11 +4,35 @@ internals.
|
|||
Index: lld/CMakeLists.txt
|
||||
--- lld/CMakeLists.txt.orig
|
||||
+++ lld/CMakeLists.txt
|
||||
@@ -206,7 +206,6 @@ endif()
|
||||
@@ -155,6 +155,20 @@ list (APPEND CMAKE_MODULE_PATH "${LLD_SOURCE_DIR}/cmak
|
||||
|
||||
include(AddLLD)
|
||||
|
||||
+option(LLD_ENABLE_WASM
|
||||
+ "Enable support for WASM."
|
||||
+ OFF)
|
||||
+if (LLD_ENABLE_WASM)
|
||||
+ add_definitions("-DLLD_ENABLE_WASM=1")
|
||||
+endif()
|
||||
+
|
||||
+option(LLD_ENABLE_MACHO
|
||||
+ "Enable support for MachO."
|
||||
+ OFF)
|
||||
+if (LLD_ENABLE_MACHO)
|
||||
+ add_definitions("-DLLD_ENABLE_MACHO=1")
|
||||
+endif()
|
||||
+
|
||||
option(LLD_USE_VTUNE
|
||||
"Enable VTune user task tracking."
|
||||
OFF)
|
||||
@@ -206,7 +220,9 @@ endif()
|
||||
add_subdirectory(docs)
|
||||
add_subdirectory(COFF)
|
||||
add_subdirectory(ELF)
|
||||
-add_subdirectory(MachO)
|
||||
+if (LLD_ENABLE_MACHO)
|
||||
+ add_subdirectory(MachO)
|
||||
+endif()
|
||||
add_subdirectory(MinGW)
|
||||
add_subdirectory(wasm)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ internals.
|
|||
Index: lld/tools/lld/CMakeLists.txt
|
||||
--- lld/tools/lld/CMakeLists.txt.orig
|
||||
+++ lld/tools/lld/CMakeLists.txt
|
||||
@@ -15,7 +15,6 @@ target_link_libraries(lld
|
||||
@@ -15,10 +15,15 @@ target_link_libraries(lld
|
||||
lldCOFF
|
||||
lldDriver
|
||||
lldELF
|
||||
|
@ -12,3 +12,12 @@ Index: lld/tools/lld/CMakeLists.txt
|
|||
lldMinGW
|
||||
lldWasm
|
||||
)
|
||||
+
|
||||
+if (LLD_ENABLE_MACHO)
|
||||
+ target_link_libraries(lld
|
||||
+ lldMachO2
|
||||
+ )
|
||||
+endif()
|
||||
|
||||
install(TARGETS lld
|
||||
RUNTIME DESTINATION bin)
|
||||
|
|
|
@ -4,16 +4,20 @@ internals.
|
|||
Index: lld/tools/lld/lld.cpp
|
||||
--- lld/tools/lld/lld.cpp.orig
|
||||
+++ lld/tools/lld/lld.cpp
|
||||
@@ -148,10 +148,12 @@ static int lldMain(int argc, const char **argv, llvm::
|
||||
@@ -148,12 +148,16 @@ static int lldMain(int argc, const char **argv, llvm::
|
||||
return !elf::link(args, exitEarly, stdoutOS, stderrOS);
|
||||
case WinLink:
|
||||
return !coff::link(args, exitEarly, stdoutOS, stderrOS);
|
||||
+#if 0
|
||||
+#ifdef LLD_ENABLE_MACHO
|
||||
case Darwin:
|
||||
return !macho::link(args, exitEarly, stdoutOS, stderrOS);
|
||||
case DarwinOld:
|
||||
return !mach_o::link(args, exitEarly, stdoutOS, stderrOS);
|
||||
+#endif
|
||||
+#ifdef LLD_ENABLE_WASM
|
||||
case Wasm:
|
||||
return !lld::wasm::link(args, exitEarly, stdoutOS, stderrOS);
|
||||
+#endif
|
||||
default:
|
||||
die("lld is a generic driver.\n"
|
||||
"Invoke ld.lld (Unix), ld64.lld (macOS), lld-link (Windows), wasm-ld"
|
||||
|
|
|
@ -2783,7 +2783,7 @@ ${CLANG_INCLUDE_PATH}/cuda_wrappers/new
|
|||
${CLANG_INCLUDE_PATH}/emmintrin.h
|
||||
${CLANG_INCLUDE_PATH}/enqcmdintrin.h
|
||||
${CLANG_INCLUDE_PATH}/f16cintrin.h
|
||||
${CLANG_INCLUDE_PATH}/float.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/float.h
|
||||
${CLANG_INCLUDE_PATH}/fma4intrin.h
|
||||
${CLANG_INCLUDE_PATH}/fmaintrin.h
|
||||
${CLANG_INCLUDE_PATH}/fxsrintrin.h
|
||||
|
@ -2798,11 +2798,11 @@ ${CLANG_INCLUDE_PATH}/hvx_hexagon_protos.h
|
|||
${CLANG_INCLUDE_PATH}/ia32intrin.h
|
||||
${CLANG_INCLUDE_PATH}/immintrin.h
|
||||
${CLANG_INCLUDE_PATH}/intrin.h
|
||||
${CLANG_INCLUDE_PATH}/inttypes.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/inttypes.h
|
||||
${CLANG_INCLUDE_PATH}/invpcidintrin.h
|
||||
${CLANG_INCLUDE_PATH}/iso646.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/iso646.h
|
||||
${CLANG_INCLUDE_PATH}/keylockerintrin.h
|
||||
${CLANG_INCLUDE_PATH}/limits.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/limits.h
|
||||
${CLANG_INCLUDE_PATH}/lwpintrin.h
|
||||
${CLANG_INCLUDE_PATH}/lzcntintrin.h
|
||||
${CLANG_INCLUDE_PATH}/mm3dnow.h
|
||||
|
@ -2846,21 +2846,21 @@ ${CLANG_INCLUDE_PATH}/sgxintrin.h
|
|||
${CLANG_INCLUDE_PATH}/shaintrin.h
|
||||
${CLANG_INCLUDE_PATH}/smmintrin.h
|
||||
${CLANG_INCLUDE_PATH}/stdalign.h
|
||||
${CLANG_INCLUDE_PATH}/stdarg.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/stdarg.h
|
||||
${CLANG_INCLUDE_PATH}/stdatomic.h
|
||||
${CLANG_INCLUDE_PATH}/stdbool.h
|
||||
${CLANG_INCLUDE_PATH}/stddef.h
|
||||
${CLANG_INCLUDE_PATH}/stdint.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/stdbool.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/stddef.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/stdint.h
|
||||
${CLANG_INCLUDE_PATH}/stdnoreturn.h
|
||||
${CLANG_INCLUDE_PATH}/tbmintrin.h
|
||||
${CLANG_INCLUDE_PATH}/tgmath.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/tgmath.h
|
||||
${CLANG_INCLUDE_PATH}/tmmintrin.h
|
||||
${CLANG_INCLUDE_PATH}/tsxldtrkintrin.h
|
||||
${CLANG_INCLUDE_PATH}/uintrintrin.h
|
||||
${CLANG_INCLUDE_PATH}/unwind.h
|
||||
${CLANG_INCLUDE_PATH}/vadefs.h
|
||||
${CLANG_INCLUDE_PATH}/vaesintrin.h
|
||||
${CLANG_INCLUDE_PATH}/varargs.h
|
||||
@comment ${CLANG_INCLUDE_PATH}/varargs.h
|
||||
${CLANG_INCLUDE_PATH}/vecintrin.h
|
||||
${CLANG_INCLUDE_PATH}/vpclmulqdqintrin.h
|
||||
${CLANG_INCLUDE_PATH}/waitpkgintrin.h
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue