From c0a457e6b9677697e38a3ebdbfbdb624d3007602 Mon Sep 17 00:00:00 2001 From: Butta Date: Mon, 26 Apr 2021 19:58:42 +0530 Subject: [PATCH] libllvm: update from 11.1.0 to 12.0.0 --- packages/libllvm/build.sh | 17 ++++--------- ...Process-Linux-NativeProcessLinux.cpp.patch | 21 ++++++++++++++++ packages/libllvm/lldb.subpackage.sh | 1 - packages/libllvm/llvm-config.in | 25 ++++++++++--------- packages/libllvm/llvm.subpackage.sh | 3 ++- 5 files changed, 41 insertions(+), 26 deletions(-) create mode 100644 packages/libllvm/lldb-source-Plugins-Process-Linux-NativeProcessLinux.cpp.patch diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index 6b040a8b39..99d0d0ccd2 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@buttaface" -TERMUX_PKG_VERSION=11.1.0 -TERMUX_PKG_SHA256=74d2529159fd118c3eac6f90107b5611bccc6f647fdea104024183e8d5e25831 +TERMUX_PKG_VERSION=12.0.0 +TERMUX_PKG_SHA256=9ed1688943a4402d7c904cc4515798cdb20080066efa010fe7e1f2551b423628 TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-$TERMUX_PKG_VERSION.src.tar.xz TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_RM_AFTER_INSTALL=" +bin/ld64.lld.darwinnew lib/libgomp.a lib/libiomp5.a " @@ -41,7 +42,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR;RISCV -DPERL_EXECUTABLE=$(which perl) -DLLVM_ENABLE_FFI=ON --DANDROID_NDK_VERSION=${TERMUX_NDK_VERSION_NUM} " if [ $TERMUX_ARCH_BITS = 32 ]; then @@ -95,21 +95,14 @@ termux_step_post_configure() { } termux_step_post_make_install() { - if [ $TERMUX_ARCH = "arm" ]; then - cp $TERMUX_PKG_SRCDIR/openmp/runtime/exports/common/include/omp.h $TERMUX_PREFIX/include - else - cp $TERMUX_PKG_SRCDIR/openmp/runtime/exports/common.ompt.optional/include/omp.h $TERMUX_PREFIX/include - fi - if [ "$TERMUX_CMAKE_BUILD" = Ninja ]; then - ninja docs-llvm-man docs-lldb-man docs-clang-man + ninja docs-llvm-man docs-clang-man else - make docs-llvm-man docs-lldb-man docs-clang-man + make docs-llvm-man docs-clang-man fi cp docs/man/* $TERMUX_PREFIX/share/man/man1 cp tools/clang/docs/man/clang.1 $TERMUX_PREFIX/share/man/man1 - cp tools/lldb/docs/man/lldb.1 $TERMUX_PREFIX/share/man/man1 cd $TERMUX_PREFIX/bin for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{clang,clang++,gcc,g++,cpp}; do diff --git a/packages/libllvm/lldb-source-Plugins-Process-Linux-NativeProcessLinux.cpp.patch b/packages/libllvm/lldb-source-Plugins-Process-Linux-NativeProcessLinux.cpp.patch new file mode 100644 index 0000000000..688af1281a --- /dev/null +++ b/packages/libllvm/lldb-source-Plugins-Process-Linux-NativeProcessLinux.cpp.patch @@ -0,0 +1,21 @@ +Reorder the header so that a preprocessor define from i686 doesn't cause +problems, undoing a change from llvm/llvm-project@2c4226f8a, see #6689 for more +info. +--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp ++++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +@@ -22,7 +22,6 @@ + #include "NativeThreadLinux.h" + #include "Plugins/Process/POSIX/ProcessPOSIXLog.h" + #include "Plugins/Process/Utility/LinuxProcMaps.h" +-#include "Procfs.h" + #include "lldb/Core/EmulateInstruction.h" + #include "lldb/Core/ModuleSpec.h" + #include "lldb/Host/Host.h" +@@ -46,6 +45,7 @@ + #include "llvm/Support/Errno.h" + #include "llvm/Support/FileSystem.h" + #include "llvm/Support/Threading.h" ++#include "Procfs.h" + + #include + #include diff --git a/packages/libllvm/lldb.subpackage.sh b/packages/libllvm/lldb.subpackage.sh index 3cfd2bf5ae..1981c36b7f 100644 --- a/packages/libllvm/lldb.subpackage.sh +++ b/packages/libllvm/lldb.subpackage.sh @@ -2,7 +2,6 @@ TERMUX_SUBPKG_INCLUDE=" bin/lldb* include/lldb/ lib/liblldb.so -share/man/man1/lldb.1.gz " TERMUX_SUBPKG_DESCRIPTION="LLVM-based debugger" TERMUX_SUBPKG_DEPENDS="libc++, libedit, libxml2, ncurses-ui-libs" diff --git a/packages/libllvm/llvm-config.in b/packages/libllvm/llvm-config.in index 6a035e1025..d16928c2d8 100644 --- a/packages/libllvm/llvm-config.in +++ b/packages/libllvm/llvm-config.in @@ -57,30 +57,31 @@ asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryfor bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler \ bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf \ debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine \ -executionengine frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser \ -hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation \ +executionengine extensions filecheck frontendopenacc frontendopenmp \ +fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc \ +hexagondisassembler hexagoninfo instcombine instrumentation interfacestub \ interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc \ lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mca mcdisassembler \ mcjit mcparser mips mipsasmparser mipscodegen \ mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen \ msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen \ -nvptxdesc nvptxinfo objcarcopts object objectyaml option orcerror orcjit passes powerpc \ +nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc \ powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo \ profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo \ -riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc \ +runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc \ sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen \ systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly \ webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler \ webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info \ -x86utils xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" +xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" static_libs="-lLLVMObjectYAML -lLLVMDlltoolDriver -lLLVMLineEditor -lLLVMFuzzMutate \ --lLLVMCoroutines -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMTextAPI -lLLVMCoverage \ +-lLLVMCoroutines -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMHelloNew -lLLVMTextAPI -lLLVMCoverage \ -lLLVMXRay -lLLVMInterpreter -lLLVMRemarks -lLLVMMIRParser -lLLVMSymbolize -lLLVMDebugInfoPDB \ --lLLVMDebugInfoDWARF -lLLVMAVRAsmParser -lLLVMAVRCodeGen -lLLVMAVRDesc -lLLVMAVRDisassembler \ +-lLLVMDebugInfoDWARF -lLLVMAVRAsmParser -lLLVMInterfaceStub -lLLVMFileCheck -lLLVMAVRCodeGen -lLLVMAVRDesc -lLLVMAVRDisassembler \ -lLLVMAVRInfo -lLLVMRISCVDisassembler -lLLVMRISCVCodeGen -lLLVMRISCVAsmParser \ --lLLVMRISCVDesc -lLLVMRISCVInfo -lLLVMRISCVUtils -lLLVMXCoreDisassembler -lLLVMXCoreCodeGen \ +-lLLVMRISCVDesc -lLLVMRISCVInfo -lLLVMXCoreDisassembler -lLLVMXCoreCodeGen \ -lLLVMXCoreDesc -lLLVMXCoreInfo -lLLVMX86Disassembler -lLLVMX86CodeGen -lLLVMX86AsmParser \ --lLLVMX86Desc -lLLVMX86Info -lLLVMX86Utils -lLLVMWebAssemblyDisassembler \ +-lLLVMX86Desc -lLLVMX86Info -lLLVMWebAssemblyDisassembler \ -lLLVMWebAssemblyCodeGen -lLLVMWebAssemblyDesc -lLLVMWebAssemblyAsmParser \ -lLLVMWebAssemblyInfo -lLLVMSystemZDisassembler -lLLVMSystemZCodeGen \ -lLLVMSystemZAsmParser -lLLVMSystemZDesc -lLLVMSystemZInfo -lLLVMSparcDisassembler \ @@ -98,10 +99,10 @@ static_libs="-lLLVMObjectYAML -lLLVMDlltoolDriver -lLLVMLineEditor -lLLVMFuzzMut -lLLVMVectorize -lLLVMLinker -lLLVMIRReader -lLLVMAsmParser -lLLVMAMDGPUAsmParser \ -lLLVMAMDGPUDesc -lLLVMAMDGPUInfo -lLLVMAMDGPUUtils -lLLVMLibDriver -lLLVMOption \ -lLLVMWindowsManifest -lLLVMAArch64Disassembler -lLLVMMCDisassembler \ --lLLVMAArch64AsmParser -lLLVMMCJIT -lLLVMTableGen -lLLVMOrcJIT -lLLVMExecutionEngine \ --lLLVMRuntimeDyld -lLLVMBitstreamReader -lLLVMCFGuard -lLLVMDWARFLinker \ +-lLLVMAArch64AsmParser -lLLVMMCJIT -lLLVMTableGen -lLLVMOrcJIT -lLLVMOrcTargetProcess -lLLVMOrcShared -lLLVMExecutionEngine \ +-lLLVMRuntimeDyld -lLLVMBitstreamReader -lLLVMCFGuard -lLLVMFrontendOpenACC -lLLVMExtensions -lLLVMDWARFLinker \ -lLLVMDebugInfoGSYM -lLLVMFrontendOpenMP -lLLVMMCA -lLLVMAArch64CodeGen -lLLVMGlobalISel \ --lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMOrcError -lLLVMJITLink -lLLVMCodeGen \ +-lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMJITLink -lLLVMCodeGen \ -lLLVMTarget -lLLVMScalarOpts -lLLVMInstCombine -lLLVMAggressiveInstCombine \ -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject \ -lLLVMMCParser -lLLVMBitReader -lLLVMCore -lLLVMAArch64Desc -lLLVMAArch64Info \ diff --git a/packages/libllvm/llvm.subpackage.sh b/packages/libllvm/llvm.subpackage.sh index 3abe297cf7..dfb2d73ddd 100644 --- a/packages/libllvm/llvm.subpackage.sh +++ b/packages/libllvm/llvm.subpackage.sh @@ -8,6 +8,7 @@ bin/obj2yaml bin/opt bin/sancov bin/sanstats +bin/split-file bin/verify-uselistorder bin/yaml2obj share/opt-viewer @@ -17,7 +18,7 @@ share/man/man1/llvm* share/man/man1/opt.1.gz share/man/man1/bugpoint.1.gz share/man/man1/dsymutil.1.gz -share/man/man1/tblgen.1.gz +share/man/man1/xxx-tblgen.1.gz " TERMUX_SUBPKG_DESCRIPTION="LLVM modular compiler and toolchain executables" TERMUX_SUBPKG_BREAKS="libllvm (<< 11.0.0-1)"