diff options
author | Juergen Daubert <jue@jue.li> | 2020-07-22 11:46:04 +0000 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2020-07-22 11:46:04 +0000 |
commit | ffd50d8bd95e6418a332cd62e71a3f7df756f7fc (patch) | |
tree | 11828d773e08de2140de8f97e100ee27e7b32f9a /llvm | |
parent | aafa10fc8d28bec550a6f21a3bbea60c4e2e3d00 (diff) | |
parent | 58926524676ff78beb89b2d0d9c344fdce8ccd93 (diff) | |
download | opt-ffd50d8bd95e6418a332cd62e71a3f7df756f7fc.tar.gz opt-ffd50d8bd95e6418a332cd62e71a3f7df756f7fc.tar.xz |
Merge branch '3.5' into 3.6
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/.footprint | 7 | ||||
-rw-r--r-- | llvm/.signature | 8 | ||||
-rw-r--r-- | llvm/Pkgfile | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/llvm/.footprint b/llvm/.footprint index 39bf37e2d..56b72a5e2 100644 --- a/llvm/.footprint +++ b/llvm/.footprint @@ -477,6 +477,9 @@ drwxr-xr-x root/root usr/include/llvm/CodeGen/PBQP/ -rw-r--r-- root/root usr/include/llvm/CodeGen/Passes.h -rw-r--r-- root/root usr/include/llvm/CodeGen/PreISelIntrinsicLowering.h -rw-r--r-- root/root usr/include/llvm/CodeGen/PseudoSourceValue.h +-rw-r--r-- root/root usr/include/llvm/CodeGen/RDFGraph.h +-rw-r--r-- root/root usr/include/llvm/CodeGen/RDFLiveness.h +-rw-r--r-- root/root usr/include/llvm/CodeGen/RDFRegisters.h -rw-r--r-- root/root usr/include/llvm/CodeGen/ReachingDefAnalysis.h -rw-r--r-- root/root usr/include/llvm/CodeGen/RegAllocPBQP.h -rw-r--r-- root/root usr/include/llvm/CodeGen/RegAllocRegistry.h @@ -1638,6 +1641,7 @@ drwxr-xr-x root/root usr/lib/cmake/llvm/ -rw-r--r-- root/root usr/lib/cmake/llvm/HandleLLVMStdlib.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/LLVM-Config.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/LLVMConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/llvm/LLVMConfigExtensions.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/LLVMConfigVersion.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/LLVMDistributionSupport.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/LLVMExports-release.cmake @@ -1648,7 +1652,7 @@ drwxr-xr-x root/root usr/lib/cmake/llvm/ -rw-r--r-- root/root usr/lib/cmake/llvm/TableGen.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/UseLibtool.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/VersionFromVCS.cmake -lrwxrwxrwx root/root usr/lib/libLLVM-10.0.0.so -> libLLVM-10.so +lrwxrwxrwx root/root usr/lib/libLLVM-10.0.1.so -> libLLVM-10.so -rwxr-xr-x root/root usr/lib/libLLVM-10.so lrwxrwxrwx root/root usr/lib/libLLVM.so -> libLLVM-10.so -rw-r--r-- root/root usr/lib/libLLVMAMDGPUAsmParser.a @@ -1684,6 +1688,7 @@ lrwxrwxrwx root/root usr/lib/libLLVM.so -> libLLVM-10.so -rw-r--r-- root/root usr/lib/libLLVMDemangle.a -rw-r--r-- root/root usr/lib/libLLVMDlltoolDriver.a -rw-r--r-- root/root usr/lib/libLLVMExecutionEngine.a +-rw-r--r-- root/root usr/lib/libLLVMExtensions.a -rw-r--r-- root/root usr/lib/libLLVMFrontendOpenMP.a -rw-r--r-- root/root usr/lib/libLLVMFuzzMutate.a -rw-r--r-- root/root usr/lib/libLLVMGlobalISel.a diff --git a/llvm/.signature b/llvm/.signature index c5556b24c..f376d68a5 100644 --- a/llvm/.signature +++ b/llvm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YZGIg/cgvjbHaKVDzAMOBsCzQYmHU6MUbujvwFtIxtQRaxn7kIU6QDOZYxvtWFk+FrPIbtsXaYCSCrJxfiBnwg= -SHA256 (Pkgfile) = a4b007a4de7eaadd6a870f353f469644a7b3486d4702d9254ba3e1fd7a3fb1b6 -SHA256 (.footprint) = dbf1b795b0bd9df16336812f61aee4e2f0a169488325789c842722803932a1ca -SHA256 (llvm-10.0.0.src.tar.xz) = df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf +RWSE3ohX2g5d/d2uIzmtzeX33GQox4+Degg7OKPxgHxyM1loCVPpqlyHGArVvSF9Xc75rqxRztUhqkX7gLCAwki6gBVdDl8BKwc= +SHA256 (Pkgfile) = cb38cc76c715fe9ddd0318d97f6c0bd12aec2864fc0ec9213aefb2c03c072dfc +SHA256 (.footprint) = e9ba3a67cd2c58fc5d0bdf215f3e0856767f92aa7738adf380383c5d9f609e68 +SHA256 (llvm-10.0.1.src.tar.xz) = c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3 SHA256 (llvm-config.h) = 2227b83b904348e5530f3475c978e11cb0f05a85024781dcb49ac86b65582707 diff --git a/llvm/Pkgfile b/llvm/Pkgfile index c43e5f19f..a4adb1711 100644 --- a/llvm/Pkgfile +++ b/llvm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake libxml2 ninja name=llvm -version=10.0.0 +version=10.0.1 release=1 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz llvm-config.h) @@ -13,7 +13,7 @@ build() { export CC=gcc export CXX=g++ - cmake -S$name-$version.src -Bbuild -GNinja \ + cmake -S $name-$version.src -B build -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;BPF' \ @@ -28,8 +28,9 @@ build() { -DLLVM_ENABLE_OCAMLDOC=0 \ -DLLVM_INSTALL_UTILS=1 \ -Wno-dev - cmake --build build - DESTDIR=$PKG cmake --install build + + ninja -C build + DESTDIR=$PKG ninja -C build install # multilib stub mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h |