July 2018 - crux-commits

ports/opt (3.4): [notify] nsd: update to 4.1.23
by crux＠crux.nu 30 Jul '18

30 Jul '18

commit acb3c543cc3ec3667133982b9df87a63bae70dbb Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jul 30 17:51:37 2018 +0200 [notify] nsd: update to 4.1.23 security fix, see https://open.nlnetlabs.nl/pipermail/nsd-users/2018-July/002580.html diff --git a/nsd/.md5sum b/nsd/.md5sum index fc65d47b8..0dc042270 100644 --- a/nsd/.md5sum +++ b/nsd/.md5sum @@ -1,3 +1,3 @@ f2dfe59bfa5a2335b51ceb7a49721431 README -315e087892c251a5714a697cf808b23f nsd-4.1.22.tar.gz +3ee2247e2e1818c512330680a8700000 nsd-4.1.23.tar.gz ba15650a7a4537405ccfef93bcce9861 pre-install diff --git a/nsd/.signature b/nsd/.signature index 62f58efb3..ba344cf6f 100644 --- a/nsd/.signature +++ b/nsd/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VaXNwTmj321Mf/ApoXQ+MsrwwLLghA+6Vpwl31sQ/rpblViqfXgw9sxwhkeGavCvaF5Wt/suDkNyQ/TziIbDgY= -SHA256 (Pkgfile) = 25ee94ebc79b399b94bf6e6ee5e58bce081d07c5009265f0f214ce44e6d63e9d +RWSE3ohX2g5d/UkKMiBKiDSGlkr6S4hdcpJBb5P9OG9JWYhRzGHAJQJffrNsBzrI4wpeWjqZ5mgmFbBj5u0nHLIM8iJUyoMsdwA= +SHA256 (Pkgfile) = 065f73da4fa23f919ba5fc1655d7e39242cb38a3504817c7e1bc388252938f0d SHA256 (.footprint) = e7c1c5de89399eb933cfdad3ceff7b6500a1726c7d8388d9ee9dfabcef8545bf -SHA256 (nsd-4.1.22.tar.gz) = f186e86705768a35ecb6ac18d1ee4eeec2745fcd1feab38e64f89c5eb5aa049c +SHA256 (nsd-4.1.23.tar.gz) = f60ed8bd676b94a1c83c4335e8a51d61baa1a952660ecf21673a1414244b85fd SHA256 (README) = 51f2d1be262d49465c151957ab4298dd41b8aa1d3c261833291b21cb8a495eab SHA256 (pre-install) = e33d6afaeb2ed8d9e959b03a047fbf6761d857e9f5ffdf1d10739155f48f4660 diff --git a/nsd/Pkgfile b/nsd/Pkgfile index de712d7ca..28640bb7f 100644 --- a/nsd/Pkgfile +++ b/nsd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl name=nsd -version=4.1.22 +version=4.1.23 release=1 source=(http://www.nlnetlabs.nl/downloads/nsd/$name-$version.tar.gz README pre-install)

1 0

ports/compat-32 (3.4): llvm-32: remove .md5sum
by crux＠crux.nu 30 Jul '18

30 Jul '18

commit 910f99201f54c17cc91f2c669cdb7be372995f06 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Jul 30 18:21:13 2018 +1000 llvm-32: remove .md5sum diff --git a/llvm-32/.md5sum b/llvm-32/.md5sum deleted file mode 100644 index 025390d..0000000 --- a/llvm-32/.md5sum +++ /dev/null @@ -1,6 +0,0 @@ -64ece10ea4c79c7f9965cae071e59811 D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch -89fc1c86c19a2c76b239936f3356569d D44420-cmake-fix-a-typo-in-llvm_config-macro.patch -a7abc4c97480385a1cbf2a9a07242883 PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch -c2d902376d0011c3039fc56cb76cf62e PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch -c57e49163d27c0496fce1351f0a49648 PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch -788a11a35fa62eb008019b37187d09d2 llvm-6.0.0.src.tar.xz

1 0

ports/opt (3.4): ccrypt: update to 1.11
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit 9411da83ba7a979611e7af9725e27c6ae89785cc Author: Juergen Daubert <jue(a)jue.li> Date: Sat Jul 28 17:32:51 2018 +0200 ccrypt: update to 1.11 diff --git a/ccrypt/.md5sum b/ccrypt/.md5sum index 001fdffe7..acd7ed39f 100644 --- a/ccrypt/.md5sum +++ b/ccrypt/.md5sum @@ -1 +1 @@ -44ddd763465c254df83f5d38851d04d7 ccrypt-1.10.tar.gz +262573b04416b3b947f0d38807ec5246 ccrypt-1.11.tar.gz diff --git a/ccrypt/.signature b/ccrypt/.signature index ce5c215bb..faf03b101 100644 --- a/ccrypt/.signature +++ b/ccrypt/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aTvixjU+wW34cYK1eibi5MBTgDJX8QuGP44VA8180br4BJ+BYZafvZ4E1CTTECLTvZ1uWvoCkS5epaDfu/Kzgc= -SHA256 (Pkgfile) = dc7c14c2d3403b4fd8bd73358f4e699444b878440fce43036a988be92892dae1 +RWSE3ohX2g5d/bV8TvpsS2wVxgkmigABfH08+rm4K5gDV4i45uIEtDJPpkLFhotGAQ4Kd3PNJPDwrMqImV9BoFG97XrcEX6khgI= +SHA256 (Pkgfile) = 67fba65a3462c30ddb09608e28b48cff80b2c2729d108d9fe8383bb996d9dda2 SHA256 (.footprint) = cdc2444e6be2a2d27664279b7100258a8bb9ab1544bf455a25654d81f8a06727 -SHA256 (ccrypt-1.10.tar.gz) = 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 +SHA256 (ccrypt-1.11.tar.gz) = b19c47500a96ee5fbd820f704c912f6efcc42b638c0a6aa7a4e3dc0a6b51a44f diff --git a/ccrypt/Pkgfile b/ccrypt/Pkgfile index 0df5c7a9e..06f1d025d 100644 --- a/ccrypt/Pkgfile +++ b/ccrypt/Pkgfile @@ -3,9 +3,9 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=ccrypt -version=1.10 -release=2 -source=(http://ccrypt.sourceforge.net/download/$name-$version.tar.gz) +version=1.11 +release=1 +source=(http://ccrypt.sourceforge.net/download/$version/$name-$version.tar.gz) build () { cd $name-$version

1 0

ports/core (3.4): man-db: update to 2.8.4
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit 43235f9797ccd2f425a39c2d1df98861a3c28ffe Author: Juergen Daubert <jue(a)jue.li> Date: Sat Jul 28 09:48:21 2018 +0200 man-db: update to 2.8.4 diff --git a/man-db/.footprint b/man-db/.footprint index 696c74eb..0908b6c7 100644 --- a/man-db/.footprint +++ b/man-db/.footprint @@ -15,12 +15,12 @@ drwxr-xr-x root/root usr/etc/ -rw-r--r-- root/root usr/etc/man_db.conf drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/man-db/ --rwxr-xr-x root/root usr/lib/man-db/libman-2.8.3.so +-rwxr-xr-x root/root usr/lib/man-db/libman-2.8.4.so -rwxr-xr-x root/root usr/lib/man-db/libman.la -lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.8.3.so --rwxr-xr-x root/root usr/lib/man-db/libmandb-2.8.3.so +lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.8.4.so +-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.8.4.so -rwxr-xr-x root/root usr/lib/man-db/libmandb.la -lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.8.3.so +lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.8.4.so drwxr-xr-x root/root usr/lib/man-db/man-db/ -rwxr-xr-x root/root usr/lib/man-db/man-db/globbing -rwxr-xr-x root/root usr/lib/man-db/man-db/manconv diff --git a/man-db/.md5sum b/man-db/.md5sum index 182b7319..e0bc8391 100644 --- a/man-db/.md5sum +++ b/man-db/.md5sum @@ -1,2 +1,2 @@ -6f3055e18fdd1ce5cbbdb30403991ec7 man-db-2.8.3.tar.xz +ab41db551f500e4a595b11203b86c67a man-db-2.8.4.tar.xz 43dcb76783c4b2f0578b43a43124f9e9 mandb.cron diff --git a/man-db/.signature b/man-db/.signature index b102bbe1..eee972c8 100644 --- a/man-db/.signature +++ b/man-db/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqgoaVQp7j/PUe9qM6x+TsWp6qlxuTRGSG2B7Syb8fjwgUHUrL/nBdh6mhWLUXfFTzUKsE1CyzwuP8K13iS3g6wg= -SHA256 (Pkgfile) = b03194eb898a0e94563e9f491ee75b997d017bc12962c7300723fae73aafc93c -SHA256 (.footprint) = b55f076c8af178964f6f7eaddce4c2b33168ebfb2b6c4f52c68a954dc4aab1d3 -SHA256 (man-db-2.8.3.tar.xz) = 5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac +RWRJc1FUaeVeqgFptuCXwmo9Umuz3U/qKn6PsTIOa8ZOUiHztmx+U+eyYCAa3s25Hu8N1ZEn1Ikfq7HQS92f6IAhcFMPLohasAs= +SHA256 (Pkgfile) = c4fef7284394e71055849f4d080cd03316cb6bc5fdb0b4c0951fe907bdeb4d9b +SHA256 (.footprint) = bc7c52421b175a46410414e0e04c8cdcc39749087ea4f55f2466dbf45a025bb8 +SHA256 (man-db-2.8.4.tar.xz) = 103c185f9d8269b9ee3b8a4cb27912b3aa393e952731ef96fedc880723472bc3 SHA256 (mandb.cron) = f2e9f1210bf6b7c3335cc6f3a9551651812428109ea8c4adc9cd5cf73461e0f1 diff --git a/man-db/Pkgfile b/man-db/Pkgfile index 749d4804..7adbc50a 100644 --- a/man-db/Pkgfile +++ b/man-db/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib gdbm libpipeline name=man-db -version=2.8.3 +version=2.8.4 release=1 source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.… \ mandb.cron)

1 0

ports/core (3.4): file: update to 5.34
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit 19937c953e2ab2455046757704a8a6c6dc26d700 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Jul 28 09:48:01 2018 +0200 file: update to 5.34 diff --git a/file/.md5sum b/file/.md5sum index 7616f2a6..ce47d7f3 100644 --- a/file/.md5sum +++ b/file/.md5sum @@ -1 +1 @@ -bbe6db96e3a9ca9554dce647390540ef file-5.33.tar.gz +44b0b6983462b18f96403d4d3ad80254 file-5.34.tar.gz diff --git a/file/.signature b/file/.signature index ca38a928..39580dce 100644 --- a/file/.signature +++ b/file/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVequ3xIQ+zcE9/2ZJuzPFcUHMufq+dQz8O66HC/HwvcRblA7xPiY9iZAZWxSMJA6COE1gncCLrc/b4jTeaSe94PQw= -SHA256 (Pkgfile) = 142492adcbb9edea4050eb5cdbf96290128828d3c389c0ffb91e2c2e6b80ee73 +RWRJc1FUaeVeqvmdRg7T2OEVp3iQHQNC30hmlt+8ODUhsmyWm81DEsg6E8c7NOlyHBPqErRi3CRip+yVdW0HTR+qjv6ji14DSwQ= +SHA256 (Pkgfile) = ae627a2bcfacca550767c221d7af031a574488b785b98d8667ec383bcbe31256 SHA256 (.footprint) = 6014d14d7cc92d75a5935fb931dde0242ea5bc2abe18703e9d2cd6a2197012bd -SHA256 (file-5.33.tar.gz) = 1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6 +SHA256 (file-5.34.tar.gz) = f15a50dbbfa83fec0bd1161e8e191b092ec832720e30cd14536e044ac623b20a diff --git a/file/Pkgfile b/file/Pkgfile index cc1ce9c7..11d968a6 100644 --- a/file/Pkgfile +++ b/file/Pkgfile @@ -4,8 +4,8 @@ # Depends on: zlib name=file -version=5.33 -release=2 +version=5.34 +release=1 source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz) build() {

1 0

ports/opt (3.4): mysql: update to 5.7.23
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit 300dc55165a00d37827f1550d72167627124595f Author: Juergen Daubert <jue(a)jue.li> Date: Sat Jul 28 09:46:27 2018 +0200 mysql: update to 5.7.23 diff --git a/mysql/.footprint b/mysql/.footprint index 18b5e9a3a..5eb06968b 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -159,8 +159,8 @@ drwxr-xr-x root/root usr/include/mysql/mysql/psi/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libmysqlclient.a lrwxrwxrwx root/root usr/lib/libmysqlclient.so -> libmysqlclient.so.20 -lrwxrwxrwx root/root usr/lib/libmysqlclient.so.20 -> libmysqlclient.so.20.3.9 --rwxr-xr-x root/root usr/lib/libmysqlclient.so.20.3.9 +lrwxrwxrwx root/root usr/lib/libmysqlclient.so.20 -> libmysqlclient.so.20.3.10 +-rwxr-xr-x root/root usr/lib/libmysqlclient.so.20.3.10 -rw-r--r-- root/root usr/lib/libmysqld.a -rw-r--r-- root/root usr/lib/libmysqlservices.a drwxr-xr-x root/root usr/lib/mysql/ diff --git a/mysql/.md5sum b/mysql/.md5sum index 75bb5b684..0ff0e0eed 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ 573a72c81f8a00c0d909de7115c1f4b8 my.cnf -4af7ca82eb0dfd4cfb23fe6ea28a2fae mysql-boost-5.7.22.tar.gz +de108e7ff350aa10402a3e707a4b4c75 mysql-boost-5.7.23.tar.gz 4f3967b521f810a0a9d7daa9c81bc85d mysqld diff --git a/mysql/.signature b/mysql/.signature index be1b2f7ba..a32d32515 100644 --- a/mysql/.signature +++ b/mysql/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RcoiePWyflekNGG3M/6UstRSCgV95RHAJO3GxDwyj4P2uNR2eN31SFclsxmnd91hftm+YUvJ/LSBOVL/2AcSgY= -SHA256 (Pkgfile) = 48dd9f006312c48ebfb9bfb668c3d917a126098586d8a7a9d38e8a6e3d69d7c8 -SHA256 (.footprint) = c7b5ac6da7af004e746888fbd3742ee211f12feaacbb98ed0f46749d097f33c5 -SHA256 (mysql-boost-5.7.22.tar.gz) = 5b2a61700af7c99f5630a7dfdb099af9283c3029843cddd9e123bcdbcc4aad03 +RWSE3ohX2g5d/R7/OyEC4IGpDWVVmnRaKFUv1gTlnadq37SsPXVeOtgMGyjA5vjat9pWm/jmFaNv5pCyZ4Zyz31QYdOqsCUltAs= +SHA256 (Pkgfile) = 0c40eebcf32cec8b26d05f073a6eba6f140afad6caeeee43c657815d7d183365 +SHA256 (.footprint) = 52178bae214ea4a0e8281979357028a4bc5a3b562207551d4bdd4c7520327063 +SHA256 (mysql-boost-5.7.23.tar.gz) = d05700ec5c1c6dae9311059dc1713206c29597f09dbd237bf0679b3c6438e87a SHA256 (my.cnf) = 51d46fe239e1e18a608e64ea1242fda946c2ea5a9ecea4507d89734e263ab828 SHA256 (mysqld) = e7bb2854c7ed9bec5a7dc74bde5db316cbdd31f190b81b21d9ac9b5aaf513157 diff --git a/mysql/Pkgfile b/mysql/Pkgfile index a75cd0126..187e74350 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses zlib openssl cmake libaio name=mysql -version=5.7.22 +version=5.7.23 release=1 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.7/$name-boost-$version.tar.gz \ my.cnf mysqld)

1 0

ports/opt (3.4): clang: 6.0.0 -> 6.0.1
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit a151f7dcd80aee60e7abd0e89a6cbefa2cbcae6d Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Jul 28 14:45:15 2018 +1000 clang: 6.0.0 -> 6.0.1 diff --git a/clang/.footprint b/clang/.footprint index 9854dde09..4a28017df 100644 --- a/clang/.footprint +++ b/clang/.footprint @@ -583,118 +583,118 @@ drwxr-xr-x root/root usr/include/clang/Tooling/Refactoring/Rename/ -rw-r--r-- root/root usr/include/clang/Tooling/Tooling.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/clang/ -drwxr-xr-x root/root usr/lib/clang/6.0.0/ -drwxr-xr-x root/root usr/lib/clang/6.0.0/include/ --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__clang_cuda_builtin_vars.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__clang_cuda_cmath.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__clang_cuda_complex_builtins.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__clang_cuda_intrinsics.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__clang_cuda_math_forward_declares.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__clang_cuda_runtime_wrapper.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__stddef_max_align_t.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__wmmintrin_aes.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/__wmmintrin_pclmul.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/adxintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/altivec.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/ammintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/arm64intr.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/arm_acle.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/arm_neon.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/armintr.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx2intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512bitalgintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512bwintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512cdintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512dqintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512erintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512fintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512ifmaintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512ifmavlintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512pfintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vbmi2intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vbmiintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vbmivlintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vlbitalgintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vlbwintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vlcdintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vldqintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vlintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vlvbmi2intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vlvnniintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vnniintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vpopcntdqintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avx512vpopcntdqvlintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/avxintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/bmi2intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/bmiintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/cetintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/clflushoptintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/clwbintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/clzerointrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/cpuid.h -drwxr-xr-x root/root usr/lib/clang/6.0.0/include/cuda_wrappers/ --rw-r--r-- root/root usr/lib/clang/6.0.0/include/cuda_wrappers/algorithm --rw-r--r-- root/root usr/lib/clang/6.0.0/include/cuda_wrappers/complex --rw-r--r-- root/root usr/lib/clang/6.0.0/include/cuda_wrappers/new --rw-r--r-- root/root usr/lib/clang/6.0.0/include/emmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/f16cintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/float.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/fma4intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/fmaintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/fxsrintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/gfniintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/htmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/htmxlintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/ia32intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/immintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/inttypes.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/iso646.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/limits.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/lwpintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/lzcntintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/mm3dnow.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/mm_malloc.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/mmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/module.modulemap --rw-r--r-- root/root usr/lib/clang/6.0.0/include/msa.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/mwaitxintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/nmmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/opencl-c.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/pkuintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/pmmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/popcntintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/prfchwintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/rdseedintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/rtmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/s390intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/shaintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/smmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stdalign.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stdarg.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stdatomic.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stdbool.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stddef.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stdint.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/stdnoreturn.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/tbmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/tgmath.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/tmmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/unwind.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/vadefs.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/vaesintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/varargs.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/vecintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/vpclmulqdqintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/wmmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/x86intrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xmmintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xopintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xsavecintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xsaveintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xsaveoptintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xsavesintrin.h --rw-r--r-- root/root usr/lib/clang/6.0.0/include/xtestintrin.h +drwxr-xr-x root/root usr/lib/clang/6.0.1/ +drwxr-xr-x root/root usr/lib/clang/6.0.1/include/ +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__clang_cuda_builtin_vars.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__clang_cuda_cmath.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__clang_cuda_complex_builtins.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__clang_cuda_intrinsics.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__clang_cuda_math_forward_declares.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__clang_cuda_runtime_wrapper.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__stddef_max_align_t.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__wmmintrin_aes.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/__wmmintrin_pclmul.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/adxintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/altivec.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/ammintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/arm64intr.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/arm_acle.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/arm_neon.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/armintr.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx2intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512bitalgintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512bwintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512cdintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512dqintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512erintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512fintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512ifmaintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512ifmavlintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512pfintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vbmi2intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vbmiintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vbmivlintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vlbitalgintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vlbwintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vlcdintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vldqintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vlintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vlvbmi2intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vlvnniintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vnniintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vpopcntdqintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avx512vpopcntdqvlintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/avxintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/bmi2intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/bmiintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/cetintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/clflushoptintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/clwbintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/clzerointrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/cpuid.h +drwxr-xr-x root/root usr/lib/clang/6.0.1/include/cuda_wrappers/ +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/cuda_wrappers/algorithm +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/cuda_wrappers/complex +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/cuda_wrappers/new +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/emmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/f16cintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/float.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/fma4intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/fmaintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/fxsrintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/gfniintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/htmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/htmxlintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/ia32intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/immintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/inttypes.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/iso646.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/limits.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/lwpintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/lzcntintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/mm3dnow.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/mm_malloc.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/mmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/module.modulemap +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/msa.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/mwaitxintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/nmmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/opencl-c.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/pkuintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/pmmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/popcntintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/prfchwintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/rdseedintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/rtmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/s390intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/shaintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/smmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stdalign.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stdarg.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stdatomic.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stdbool.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stddef.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stdint.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/stdnoreturn.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/tbmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/tgmath.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/tmmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/unwind.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/vadefs.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/vaesintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/varargs.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/vecintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/vpclmulqdqintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/wmmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/x86intrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xmmintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xopintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xsavecintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xsaveintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xsaveoptintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xsavesintrin.h +-rw-r--r-- root/root usr/lib/clang/6.0.1/include/xtestintrin.h -rwxr-xr-x root/root usr/lib/clang/c++-analyzer -rwxr-xr-x root/root usr/lib/clang/ccc-analyzer drwxr-xr-x root/root usr/lib/cmake/ diff --git a/clang/.md5sum b/clang/.md5sum deleted file mode 100644 index 2acaa6fbc..000000000 --- a/clang/.md5sum +++ /dev/null @@ -1,3 +0,0 @@ -121b3896cb0c7765d690acc5d9495d24 cfe-6.0.0.src.tar.xz -788a11a35fa62eb008019b37187d09d2 llvm-6.0.0.src.tar.xz -fcd6954a7fbd05687990e59e87131c3e llvm-config.h diff --git a/clang/.signature b/clang/.signature index 99de8768c..ee7823675 100644 --- a/clang/.signature +++ b/clang/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fHtPw5vqMtan+Q31Ozhvh5IyGHfomU5qANHe1s5KYDOMNnmP1hyXRaeFb7UVd8mWtFD4o/Q9ylh4cdVpoFxdA0= -SHA256 (Pkgfile) = 61679aecabeeaf3ee6f585b04fa353bd62fbd39ec15dc4872d2b51afd65f5f38 -SHA256 (.footprint) = afb70e4331298763d3b7a0e4de6a8c0f1d562922381726faf8c27b2348b39cc7 -SHA256 (llvm-6.0.0.src.tar.xz) = 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 -SHA256 (cfe-6.0.0.src.tar.xz) = e07d6dd8d9ef196cfc8e8bb131cbd6a2ed0b1caf1715f9d05b0f0eeaddb6df32 -SHA256 (llvm-config.h) = 2227b83b904348e5530f3475c978e11cb0f05a85024781dcb49ac86b65582707 +RWSE3ohX2g5d/fj9oWjA8NzMyUNK1eULfQW5Ff735526uH+gvpERUTKrA3Jj3kC05ii1X5wzDMSmt97kZcVfwTutN2wXDIJnnQc= +SHA256 (Pkgfile) = 9749a02c1f51dd1de935379883a0a9d041eff81c1484eccfd8c5c5fa5d4b231d +SHA256 (.footprint) = 8c345b4a954d1cd264297f186a0c7189ca28f80f39b54e0f4bdc93b2653a1f3c +SHA256 (llvm-6.0.1.src.tar.xz) = b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2 +SHA256 (cfe-6.0.1.src.tar.xz) = 7c243f1485bddfdfedada3cd402ff4792ea82362ff91fbdac2dae67c6026b667 diff --git a/clang/Pkgfile b/clang/Pkgfile index 61bc5116b..3608c06b5 100644 --- a/clang/Pkgfile +++ b/clang/Pkgfile @@ -4,10 +4,9 @@ # Depends on: llvm name=clang -version=6.0.0 +version=6.0.1 release=1 -source=(https://llvm.org/releases/$version/{llvm,cfe}-$version.src.tar.xz \ - llvm-config.h) +source=(https://llvm.org/releases/$version/{llvm,cfe}-$version.src.tar.xz) build() { mv cfe-$version.src llvm-$version.src/tools/clang @@ -16,7 +15,9 @@ build() { mkdir build cd build - cmake -DLLVM_ENABLE_CXX1Y=1 \ + cmake .. -G Ninja \ + -DLLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \ + -DLLVM_ENABLE_CXX1Y=1 \ -DLLVM_INCLUDE_EXAMPLES=0 \ -DLLVM_INCLUDE_TESTS=0 \ -DLLVM_ENABLE_FFI=1 \ @@ -24,14 +25,10 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_APPEND_VC_REV=0 \ - -Wno-dev .. + -Wno-dev - MAKEFLAGS="$MAKEFLAGS" make - make DESTDIR=$PKG install - - # multilib stub - mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h - install -m 0644 $SRC/llvm-config.h $PKG/usr/include/llvm/Config/ + ninja + DESTDIR=$PKG ninja install # only clang may be left, remove llvm rm -r $PKG/usr/include/llvm{,-c} @@ -42,4 +39,5 @@ build() { mv $PKG/usr/libexec/{c++-analyzer,ccc-analyzer} $PKG/usr/lib/clang rmdir $PKG/usr/libexec + sed -i 's|libexec|lib/clang|' $PKG/usr/bin/scan-build }

1 0

ports/opt (3.4): [notify] llvm: 6.0.0 -> 6.0.1 new dependency: ninja
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit 6d0a17f046fee9e2995e17fbe5241c3b03020550 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Jul 28 14:44:40 2018 +1000 [notify] llvm: 6.0.0 -> 6.0.1 new dependency: ninja diff --git a/llvm/.footprint b/llvm/.footprint index 13ec6713b..7f5495e81 100644 --- a/llvm/.footprint +++ b/llvm/.footprint @@ -1320,7 +1320,7 @@ drwxr-xr-x root/root usr/lib/cmake/llvm/ -rw-r--r-- root/root usr/lib/cmake/llvm/LLVMProcessSources.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/TableGen.cmake -rw-r--r-- root/root usr/lib/cmake/llvm/VersionFromVCS.cmake -lrwxrwxrwx root/root usr/lib/libLLVM-6.0.0.so -> libLLVM-6.0.so +lrwxrwxrwx root/root usr/lib/libLLVM-6.0.1.so -> libLLVM-6.0.so -rwxr-xr-x root/root usr/lib/libLLVM-6.0.so lrwxrwxrwx root/root usr/lib/libLLVM.so -> libLLVM-6.0.so -rw-r--r-- root/root usr/lib/libLLVMAMDGPUAsmParser.a @@ -1395,8 +1395,8 @@ lrwxrwxrwx root/root usr/lib/libLLVM.so -> libLLVM-6.0.so -rw-r--r-- root/root usr/lib/libLLVMXRay.a -rw-r--r-- root/root usr/lib/libLLVMipo.a lrwxrwxrwx root/root usr/lib/libLTO.so -> libLTO.so.6 -lrwxrwxrwx root/root usr/lib/libLTO.so.6 -> libLTO.so.6.0.0 --rwxr-xr-x root/root usr/lib/libLTO.so.6.0.0 +lrwxrwxrwx root/root usr/lib/libLTO.so.6 -> libLTO.so.6.0.1 +-rwxr-xr-x root/root usr/lib/libLTO.so.6.0.1 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/opt-viewer/ -rwxr-xr-x root/root usr/share/opt-viewer/opt-diff.py diff --git a/llvm/.md5sum b/llvm/.md5sum deleted file mode 100644 index 7b2c39085..000000000 --- a/llvm/.md5sum +++ /dev/null @@ -1,7 +0,0 @@ -64ece10ea4c79c7f9965cae071e59811 D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch -89fc1c86c19a2c76b239936f3356569d D44420-cmake-fix-a-typo-in-llvm_config-macro.patch -a7abc4c97480385a1cbf2a9a07242883 PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch -c2d902376d0011c3039fc56cb76cf62e PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch -c57e49163d27c0496fce1351f0a49648 PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch -788a11a35fa62eb008019b37187d09d2 llvm-6.0.0.src.tar.xz -fcd6954a7fbd05687990e59e87131c3e llvm-config.h diff --git a/llvm/.signature b/llvm/.signature index b1d2eb9a1..c94f591b6 100644 --- a/llvm/.signature +++ b/llvm/.signature @@ -1,11 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WL0fEZIW4z61IYSRa7y7dR9+E5+D1ccJt41PT+/ZocXRId3bPsNSrtIjUmWas4bMpDgTP2qiVRnvMWQZyNwuA8= -SHA256 (Pkgfile) = d4f00216738b2451638834b3d4e00904b5447f3a632f97ab3d000c5a1e7d522a -SHA256 (.footprint) = 9e55f99cca4f9100bfb4789d94b97878241f6c63560e17a390389d2b245d62c7 -SHA256 (llvm-6.0.0.src.tar.xz) = 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 +RWSE3ohX2g5d/RZgLq90jT5yaKORp95CkjfjF4S6nVV3nfYiy3fJs7JwoePRUbB+FlhfrAT0ub06fo0vRpWJFo/BTccsmDeClQM= +SHA256 (Pkgfile) = 9346bf4998e788d03be834736170acfbf81175c6216e53b66d70bc0d1ad36766 +SHA256 (.footprint) = 7cc05e5e2e4b60e5bf0129a77399eb826582865d14df8eb80cb1465eb55fd2c5 +SHA256 (llvm-6.0.1.src.tar.xz) = b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2 SHA256 (llvm-config.h) = 2227b83b904348e5530f3475c978e11cb0f05a85024781dcb49ac86b65582707 -SHA256 (PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch) = 7d0082d1c641873c1d45c2f076b9533fbc43002d605336afa92198b8830a5bcb -SHA256 (PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch) = 5a90833c15c4981e7accd405290491d7930f991d30943d7ae9e4e338149731ff -SHA256 (PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch) = da80b59c9abe9fe864ff8dc42132c5aa135a79d342fd147ae6f54e2621e009fa -SHA256 (D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch) = 96e2f3ca8b7d1bdbe2606a1eebb12c57b39838d1bcc15e40388e8d59649a9f4a -SHA256 (D44420-cmake-fix-a-typo-in-llvm_config-macro.patch) = 5cc114fd711e6ea836a6270b2f713e2e751c49e8b5ffa6c6812127ca801acef3 diff --git a/llvm/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch b/llvm/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch deleted file mode 100644 index 02861acf5..000000000 --- a/llvm/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4d613a84ce271c6225068bef67d727ae02b2e3b1 Mon Sep 17 00:00:00 2001 -From: Pavel Labath <labath(a)google.com> -Date: Wed, 14 Mar 2018 09:28:38 +0000 -Subject: [PATCH] Export LLVM_DYLIB_COMPONENTS in LLVMConfig.cmake - -Summary: -This is needed so that external projects (e.g. a standalone build of -lldb) can link to the LLVM shared library via the USE_SHARED argument of -llvm_config. Without this, llvm_config would add LLVM to the link list, -but then also add the constituent static libraries, resulting in -multiply defined symbols. - -Reviewers: beanz, mgorny - -Subscribers: llvm-commits - -Differential Revision: https://reviews.llvm.org/D44391 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327484 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - cmake/modules/LLVMConfig.cmake.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in -index fe4df5278498..e70018679846 100644 ---- a/cmake/modules/LLVMConfig.cmake.in -+++ b/cmake/modules/LLVMConfig.cmake.in -@@ -13,6 +13,8 @@ set(LLVM_COMMON_DEPENDS @LLVM_COMMON_DEPENDS@) - - set(LLVM_AVAILABLE_LIBS @LLVM_AVAILABLE_LIBS@) - -+set(LLVM_DYLIB_COMPONENTS @LLVM_DYLIB_COMPONENTS@) -+ - set(LLVM_ALL_TARGETS @LLVM_ALL_TARGETS@) - - set(LLVM_TARGETS_TO_BUILD @LLVM_TARGETS_TO_BUILD@) diff --git a/llvm/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch b/llvm/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch deleted file mode 100644 index 8303b10d0..000000000 --- a/llvm/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cmake/modules/LLVM-Config.cmake -=================================================================== ---- cmake/modules/LLVM-Config.cmake -+++ cmake/modules/LLVM-Config.cmake -@@ -68,7 +68,7 @@ - cmake_parse_arguments(ARG "USE_SHARED" "" "" ${ARGN}) - set(link_components ${ARG_UNPARSED_ARGUMENTS}) - -- if(USE_SHARED) -+ if(ARG_USE_SHARED) - # If USE_SHARED is specified, then we link against libLLVM, - # but also against the component libraries below. This is - # done in case libLLVM does not contain all of the components diff --git a/llvm/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch b/llvm/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch deleted file mode 100644 index fb758bcaf..000000000 --- a/llvm/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c9054610e354340f9474dcd13a927f929912d1d Mon Sep 17 00:00:00 2001 -From: Eugene Zelenko <eugene.zelenko(a)gmail.com> -Date: Tue, 6 Mar 2018 23:06:13 +0000 -Subject: [PATCH] [Transforms] Add missing header for InstructionCombining.cpp, - in order to export LLVMInitializeInstCombine as extern "C". Fixes PR35947. - -Patch by Brenton Bostick. - -Differential revision: https://reviews.llvm.org/D44140 - - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326843 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Transforms/InstCombine/InstructionCombining.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp -index a3b2fe9e5d22..7ec73433e8f6 100644 ---- a/lib/Transforms/InstCombine/InstructionCombining.cpp -+++ b/lib/Transforms/InstCombine/InstructionCombining.cpp -@@ -34,6 +34,7 @@ - //===----------------------------------------------------------------------===// - - #include "InstCombineInternal.h" -+#include "llvm-c/Initialization.h" - #include "llvm/ADT/APInt.h" - #include "llvm/ADT/ArrayRef.h" - #include "llvm/ADT/DenseMap.h" diff --git a/llvm/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch b/llvm/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch deleted file mode 100644 index 1841cf517..000000000 --- a/llvm/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 783006ec19853403b8fe799e4c1b9496cb03504a Mon Sep 17 00:00:00 2001 -From: Bjorn Pettersson <bjorn.a.pettersson(a)ericsson.com> -Date: Tue, 6 Mar 2018 08:47:07 +0000 -Subject: [PATCH] [DebugInfo] Discard invalid DBG_VALUE instructions in - LiveDebugVariables - -Summary: -This is a workaround for pr36417 -https://bugs.llvm.org/show_bug.cgi?id=36417 - -LiveDebugVariables will now verify that the DBG_VALUE instructions -are sane (prior to register allocation) by asking LIS if a virtual -register used in the DBG_VALUE is live (or dead def) in the slot -index before the DBG_VALUE. If it isn't sane the DBG_VALUE is -discarded. - -One pass that was identified as introducing non-sane DBG_VALUE -instructtons, when analysing pr36417, was the DAG->DAG Instruction -Selection. It sometimes inserts DBG_VALUE instructions referring to -a virtual register that is defined later in the same basic block. -So it is a use before def kind of problem. The DBG_VALUE is -typically inserted in the beginning of a basic block when this -happens. The problem can be seen in the test case -test/DebugInfo/X86/dbg-value-inlined-parameter.ll - -Reviewers: aprantl, rnk, probinson - -Reviewed By: aprantl - -Subscribers: vsk, davide, alexcrichton, Ka-Ka, eraman, llvm-commits, JDevlieghere - -Differential Revision: https://reviews.llvm.org/D43956 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326769 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/CodeGen/LiveDebugVariables.cpp | 38 +++++- - test/DebugInfo/X86/dbg-value-inlined-parameter.ll | 6 +- - .../X86/live-debug-vars-discard-invalid.mir | 141 +++++++++++++++++++++ - 3 files changed, 181 insertions(+), 4 deletions(-) - create mode 100644 test/DebugInfo/X86/live-debug-vars-discard-invalid.mir - -diff --git a/lib/CodeGen/LiveDebugVariables.cpp b/lib/CodeGen/LiveDebugVariables.cpp -index 09168b6b9309..f3fcd004defd 100644 ---- a/lib/CodeGen/LiveDebugVariables.cpp -+++ b/lib/CodeGen/LiveDebugVariables.cpp -@@ -514,6 +514,39 @@ bool LDVImpl::handleDebugValue(MachineInstr &MI, SlotIndex Idx) { - return false; - } - -+ // Detect invalid DBG_VALUE instructions, with a debug-use of a virtual -+ // register that hasn't been defined yet. If we do not remove those here, then -+ // the re-insertion of the DBG_VALUE instruction after register allocation -+ // will be incorrect. -+ // TODO: If earlier passes are corrected to generate sane debug information -+ // (and if the machine verifier is improved to catch this), then these checks -+ // could be removed or replaced by asserts. -+ bool Discard = false; -+ if (MI.getOperand(0).isReg() && -+ TargetRegisterInfo::isVirtualRegister(MI.getOperand(0).getReg())) { -+ const unsigned Reg = MI.getOperand(0).getReg(); -+ if (!LIS->hasInterval(Reg)) { -+ // The DBG_VALUE is described by a virtual register that does not have a -+ // live interval. Discard the DBG_VALUE. -+ Discard = true; -+ DEBUG(dbgs() << "Discarding debug info (no LIS interval): " -+ << Idx << " " << MI); -+ } else { -+ // The DBG_VALUE is only valid if either Reg is live out from Idx, or Reg -+ // is defined dead at Idx (where Idx is the slot index for the instruction -+ // preceeding the DBG_VALUE). -+ const LiveInterval &LI = LIS->getInterval(Reg); -+ LiveQueryResult LRQ = LI.Query(Idx); -+ if (!LRQ.valueOutOrDead()) { -+ // We have found a DBG_VALUE with the value in a virtual register that -+ // is not live. Discard the DBG_VALUE. -+ Discard = true; -+ DEBUG(dbgs() << "Discarding debug info (reg not live): " -+ << Idx << " " << MI); -+ } -+ } -+ } -+ - // Get or create the UserValue for (variable,offset) here. - bool IsIndirect = MI.getOperand(1).isImm(); - if (IsIndirect) -@@ -522,7 +555,10 @@ bool LDVImpl::handleDebugValue(MachineInstr &MI, SlotIndex Idx) { - const DIExpression *Expr = MI.getDebugExpression(); - UserValue *UV = - getUserValue(Var, Expr, MI.getDebugLoc()); -- UV->addDef(Idx, MI.getOperand(0), IsIndirect); -+ if (!Discard) -+ UV->addDef(Idx, MI.getOperand(0), IsIndirect); -+ else -+ UV->addDef(Idx, MachineOperand::CreateReg(0U, RegState::Debug), false); - return true; - } - -diff --git a/test/DebugInfo/X86/dbg-value-inlined-parameter.ll b/test/DebugInfo/X86/dbg-value-inlined-parameter.ll -index 9954039654bb..e83cf0aa7ffd 100644 ---- a/test/DebugInfo/X86/dbg-value-inlined-parameter.ll -+++ b/test/DebugInfo/X86/dbg-value-inlined-parameter.ll -@@ -32,10 +32,10 @@ - ;CHECK-NEXT: DW_AT_call_line - - ;CHECK: DW_TAG_formal_parameter --;FIXME: Linux shouldn't drop this parameter either... - ;CHECK-NOT: DW_TAG --;DARWIN: DW_AT_abstract_origin {{.*}} "sp" --;DARWIN: DW_TAG_formal_parameter -+;FIXME: Shouldn't drop this parameter... -+;XCHECK: DW_AT_abstract_origin {{.*}} "sp" -+;XCHECK: DW_TAG_formal_parameter - ;CHECK: DW_AT_abstract_origin {{.*}} "nums" - ;CHECK-NOT: DW_TAG_formal_parameter - -diff --git a/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir b/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir -new file mode 100644 -index 000000000000..abc21bc6ac90 ---- /dev/null -+++ b/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir -@@ -0,0 +1,141 @@ -+# RUN: llc -mtriple=x86_64-linux-gnu -start-before greedy -stop-after virtregrewriter -o - %s | FileCheck %s -+ -+--- | -+ ; ModuleID = '<stdin>' -+ source_filename = "test/DebugInfo/X86/dbg-value-inlined-parameter.ll" -+ target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" -+ target triple = "x86_64-apple-darwin" -+ -+ %struct.S1 = type { float*, i32 } -+ -+ @p = common global %struct.S1 zeroinitializer, align 8, !dbg !0 -+ -+ ; Function Attrs: nounwind optsize ssp -+ define void @foobar() !dbg !15 { -+ entry: -+ tail call void @llvm.dbg.value(metadata %struct.S1* @p, metadata !18, metadata !DIExpression()) , !dbg !25 -+ ret void, !dbg !32 -+ } -+ -+ ; Function Attrs: nounwind readnone speculatable -+ declare void @llvm.dbg.value(metadata, metadata, metadata) #2 -+ -+ !llvm.dbg.cu = !{!2} -+ !llvm.module.flags = !{!14} -+ -+ !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression()) -+ !1 = !DIGlobalVariable(name: "p", scope: !2, file: !3, line: 14, type: !6, isLocal: false, isDefinition: true) -+ !2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 2.9 (trunk 125693)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !4, globals: !5, imports: !4) -+ !3 = !DIFile(filename: "nm2.c", directory: "/private/tmp") -+ !4 = !{} -+ !5 = !{!0} -+ !6 = !DIDerivedType(tag: DW_TAG_typedef, name: "S1", scope: !2, file: !3, line: 4, baseType: !7) -+ !7 = !DICompositeType(tag: DW_TAG_structure_type, name: "S1", scope: !2, file: !3, line: 1, size: 128, align: 64, elements: !8) -+ !8 = !{!9, !12} -+ !9 = !DIDerivedType(tag: DW_TAG_member, name: "m", scope: !3, file: !3, line: 2, baseType: !10, size: 64, align: 64) -+ !10 = !DIDerivedType(tag: DW_TAG_pointer_type, scope: !2, baseType: !11, size: 64, align: 64) -+ !11 = !DIBasicType(name: "float", size: 32, align: 32, encoding: DW_ATE_float) -+ !12 = !DIDerivedType(tag: DW_TAG_member, name: "nums", scope: !3, file: !3, line: 3, baseType: !13, size: 32, align: 32, offset: 64) -+ !13 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -+ !14 = !{i32 1, !"Debug Info Version", i32 3} -+ !15 = distinct !DISubprogram(name: "foobar", scope: !3, file: !3, line: 15, type: !16, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, unit: !2) -+ !16 = !DISubroutineType(types: !17) -+ !17 = !{null} -+ !18 = !DILocalVariable(name: "sp", arg: 1, scope: !19, file: !3, line: 7, type: !24) -+ !19 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 8, type: !20, isLocal: false, isDefinition: true, scopeLine: 8, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, unit: !2, variables: !22) -+ !20 = !DISubroutineType(types: !21) -+ !21 = !{!13} -+ !22 = !{!18, !23} -+ !23 = !DILocalVariable(name: "nums", arg: 2, scope: !19, file: !3, line: 7, type: !13) -+ !24 = !DIDerivedType(tag: DW_TAG_pointer_type, scope: !2, baseType: !6, size: 64, align: 64) -+ !25 = !DILocation(line: 7, column: 13, scope: !19, inlinedAt: !26) -+ !26 = !DILocation(line: 16, column: 3, scope: !27) -+ !27 = distinct !DILexicalBlock(scope: !15, file: !3, line: 15, column: 15) -+ !32 = !DILocation(line: 17, column: 1, scope: !27) -+ -+... -+--- -+name: foobar -+tracksRegLiveness: true -+body: | -+ bb.0: -+ %1:gr64 = IMPLICIT_DEF -+ %2:gr64 = IMPLICIT_DEF -+ -+ bb.1: -+ ; This DBG_VALUE will be discarded (use before def of %0). -+ DBG_VALUE debug-use %0, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %0:gr64 = IMPLICIT_DEF -+ %0:gr64 = IMPLICIT_DEF -+ %0:gr64 = IMPLICIT_DEF -+ %0:gr64 = IMPLICIT_DEF -+ -+ bb.2: -+ ; This DBG_VALUE will be discarded (%1 is defined earlier, but it is not live in, so we do not know where %1 is stored). -+ DBG_VALUE debug-use %1, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %1:gr64 = IMPLICIT_DEF -+ %1:gr64 = IMPLICIT_DEF -+ %1:gr64 = IMPLICIT_DEF -+ %1:gr64 = IMPLICIT_DEF -+ ; This DBG_VALUE is kept, even if %1 is dead, it was defined in the prev instruction, -+ ; so the value should be available for as long as the register allocated to %1 is live. -+ DBG_VALUE debug-use %1, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ -+ bb.3: -+ %1:gr64 = IMPLICIT_DEF -+ DBG_VALUE 0, debug-use %noreg, !23, !DIExpression(), debug-location !25 -+ ; This DBG_VALUE is kept, even if %1 is dead, it was defined in the prev non-dbg instruction, -+ ; so the value should be available for as long as the register allocated to %1 is live. -+ DBG_VALUE debug-use %1, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ -+ bb.4: -+ ; All DBG_VALUEs here should survive. %2 is livein as it was defined in bb.0, and it has use/def in the BTS64rr instruction. -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %2:gr64 = BTS64rr %2, 0, implicit-def %eflags -+ DBG_VALUE 0, debug-use %noreg, !23, !DIExpression(), debug-location !25 -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %2:gr64 = BTS64rr %2, 0, implicit-def %eflags -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %2:gr64 = BTS64rr %2, 0, implicit-def %eflags -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ -+ bb.5: -+ RET 0, debug-location !32 -+... -+ -+# CHECK-LABEL: name: foobar -+ -+# CHECK-LABEL: bb.1: -+## After solving https://bugs.llvm.org/show_bug.cgi?id=36579 we expect to get a -+## DBG_VALUE debug-use %noreg -+## here. -+# CHECK-NOT: DBG_VALUE -+ -+# CHECK-LABEL: bb.2: -+## After solving https://bugs.llvm.org/show_bug.cgi?id=36579 we expect to get a -+## DBG_VALUE debug-use %noreg -+## here. -+# CHECK-NOT: DBG_VALUE -+# CHECK: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: DBG_VALUE debug-use %rcx, debug-use %noreg, !18, !DIExpression() -+ -+# CHECK-LABEL: bb.3: -+# CHECK: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: DBG_VALUE 0, debug-use %noreg, !23, !DIExpression() -+# CHECK-NEXT: DBG_VALUE debug-use %rcx, debug-use %noreg, !18, !DIExpression() -+ -+# CHECK-LABEL: bb.4: -+# CHECK: liveins: %rax -+# CHECK: DBG_VALUE debug-use %rax, debug-use %noreg, !18, !DIExpression() -+# CHECK-NEXT: renamable %rax = BTS64rr killed renamable %rax, 0, implicit-def %eflags -+# CHECK-NEXT: DBG_VALUE 0, debug-use %noreg, !23, !DIExpression() -+# CHECK-NEXT: DBG_VALUE debug-use %rax, debug-use %noreg, !18, !DIExpression() -+# CHECK-NEXT: renamable %rax = BTS64rr killed renamable %rax, 0, implicit-def %eflags -+# CHECK-NEXT: DBG_VALUE debug-use %rax, debug-use %noreg, !18, !DIExpression() -+# CHECK-NEXT: dead renamable %rax = BTS64rr killed renamable %rax, 0, implicit-def %eflags -+ -+# CHECK-LABEL: bb.5: -+# CHECK-NEXT: RET 0 diff --git a/llvm/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch b/llvm/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch deleted file mode 100644 index 602e6ac55..000000000 --- a/llvm/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 866cf8f3afa0224e31d36ca0351ac5cb0d303757 Mon Sep 17 00:00:00 2001 -From: Bjorn Pettersson <bjorn.a.pettersson(a)ericsson.com> -Date: Tue, 6 Mar 2018 13:23:28 +0000 -Subject: [PATCH] Fixup for rL326769 (RegState::Debug is being truncated to a - bool) - -I obviously messed up arguments to MachineOperand::CreateReg -in rL326769. This should make it work as intended. - -Thanks to RKSimon for spotting this. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326780 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/CodeGen/LiveDebugVariables.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/lib/CodeGen/LiveDebugVariables.cpp b/lib/CodeGen/LiveDebugVariables.cpp -index f3fcd004defd..8c547cdcff33 100644 ---- a/lib/CodeGen/LiveDebugVariables.cpp -+++ b/lib/CodeGen/LiveDebugVariables.cpp -@@ -557,8 +557,11 @@ bool LDVImpl::handleDebugValue(MachineInstr &MI, SlotIndex Idx) { - getUserValue(Var, Expr, MI.getDebugLoc()); - if (!Discard) - UV->addDef(Idx, MI.getOperand(0), IsIndirect); -- else -- UV->addDef(Idx, MachineOperand::CreateReg(0U, RegState::Debug), false); -+ else { -+ MachineOperand MO = MachineOperand::CreateReg(0U, false); -+ MO.setIsDebug(); -+ UV->addDef(Idx, MO, false); -+ } - return true; - } - diff --git a/llvm/Pkgfile b/llvm/Pkgfile index ff5fa4e79..cc902ab9a 100644 --- a/llvm/Pkgfile +++ b/llvm/Pkgfile @@ -1,18 +1,13 @@ # Description: LLVM compiler backend # URL: http://llvm.org/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: cmake libffi python +# Depends on: cmake libffi ninja name=llvm -version=6.0.0 -release=2 +version=6.0.1 +release=1 source=(https://llvm.org/releases/$version/$name-$version.src.tar.xz - llvm-config.h - PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch - PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch - PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch - D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch - D44420-cmake-fix-a-typo-in-llvm_config-macro.patch) + llvm-config.h) build() { export CC=gcc @@ -20,40 +15,28 @@ build() { cd $name-$version.src - # https://bugs.llvm.org/show_bug.cgi?id=35947 - patch -p1 -i $SRC/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch - - # https://bugs.llvm.org/show_bug.cgi?id=36417 - patch -p1 -i $SRC/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch - patch -p1 -i $SRC/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch - - # https://reviews.llvm.org/D44391 - patch -p1 -i $SRC/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch - - # https://reviews.llvm.org/D44420 - patch -p0 -i $SRC/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch - mkdir build cd build - cmake -DLLVM_ENABLE_CXX1Y=1 \ + cmake .. -G Ninja \ + -DLLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \ + -DLLVM_ENABLE_CXX1Y=1 \ -DLLVM_INCLUDE_EXAMPLES=0 \ -DLLVM_INCLUDE_TESTS=0 \ -DLLVM_ENABLE_FFI=1 \ -DLLVM_ENABLE_OCAMLDOC=0 \ -DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;BPF' \ -DLLVM_BUILD_LLVM_DYLIB=1 \ - -DLLVM_INSTALL_UTILS=1 \ + -DLLVM_INSTALL_UTILS=1 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_APPEND_VC_REV=0 \ - -Wno-dev .. + -Wno-dev - MAKEFLAGS="$MAKEFLAGS" make - make DESTDIR=$PKG install + ninja + DESTDIR=$PKG ninja install # multilib stub mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h install -m 0644 $SRC/llvm-config.h $PKG/usr/include/llvm/Config/ - }

1 0

ports/compat-32 (3.4): llvm-32: 6.0.0 -> 6.0.1
by crux＠crux.nu 28 Jul '18

28 Jul '18

commit 164f7c5b6cd6b55bfa151379cb798c00a869de21 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Jul 28 14:40:08 2018 +1000 llvm-32: 6.0.0 -> 6.0.1 diff --git a/llvm-32/.footprint b/llvm-32/.footprint index 3036be3..e14ca8e 100644 --- a/llvm-32/.footprint +++ b/llvm-32/.footprint @@ -36,7 +36,7 @@ drwxr-xr-x root/root usr/lib32/cmake/llvm/ -rw-r--r-- root/root usr/lib32/cmake/llvm/LLVMProcessSources.cmake -rw-r--r-- root/root usr/lib32/cmake/llvm/TableGen.cmake -rw-r--r-- root/root usr/lib32/cmake/llvm/VersionFromVCS.cmake -lrwxrwxrwx root/root usr/lib32/libLLVM-6.0.0.so -> libLLVM-6.0.so +lrwxrwxrwx root/root usr/lib32/libLLVM-6.0.1.so -> libLLVM-6.0.so -rwxr-xr-x root/root usr/lib32/libLLVM-6.0.so lrwxrwxrwx root/root usr/lib32/libLLVM.so -> libLLVM-6.0.so -rw-r--r-- root/root usr/lib32/libLLVMAMDGPUAsmParser.a @@ -111,6 +111,6 @@ lrwxrwxrwx root/root usr/lib32/libLLVM.so -> libLLVM-6.0.so -rw-r--r-- root/root usr/lib32/libLLVMXRay.a -rw-r--r-- root/root usr/lib32/libLLVMipo.a lrwxrwxrwx root/root usr/lib32/libLTO.so -> libLTO.so.6 -lrwxrwxrwx root/root usr/lib32/libLTO.so.6 -> libLTO.so.6.0.0 --rwxr-xr-x root/root usr/lib32/libLTO.so.6.0.0 +lrwxrwxrwx root/root usr/lib32/libLTO.so.6 -> libLTO.so.6.0.1 +-rwxr-xr-x root/root usr/lib32/libLTO.so.6.0.1 drwxr-xr-x root/root usr/share/ diff --git a/llvm-32/.signature b/llvm-32/.signature index 015b2c0..ab501f0 100644 --- a/llvm-32/.signature +++ b/llvm-32/.signature @@ -1,10 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXTJnGS7UXcbf0Qprs8XzgBLc1TuDFnS/BKeMRdqxNDow4EOtijK/IJNQWUULWvIhfzpdlpMtdn1ittpFRDpqtwc= -SHA256 (Pkgfile) = e1a97c927ce0d218c0432a534d2dcbcfe93a605aa3c6b5be45db06244e1b838f -SHA256 (.footprint) = 224a48281b442c63bee74e69f4a160f54f073112524896d84ff18b88da4a363d -SHA256 (llvm-6.0.0.src.tar.xz) = 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 -SHA256 (PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch) = 7d0082d1c641873c1d45c2f076b9533fbc43002d605336afa92198b8830a5bcb -SHA256 (PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch) = 5a90833c15c4981e7accd405290491d7930f991d30943d7ae9e4e338149731ff -SHA256 (PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch) = da80b59c9abe9fe864ff8dc42132c5aa135a79d342fd147ae6f54e2621e009fa -SHA256 (D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch) = 96e2f3ca8b7d1bdbe2606a1eebb12c57b39838d1bcc15e40388e8d59649a9f4a -SHA256 (D44420-cmake-fix-a-typo-in-llvm_config-macro.patch) = 5cc114fd711e6ea836a6270b2f713e2e751c49e8b5ffa6c6812127ca801acef3 +RWSwxGo/zH7eXe68SiQEIJ5QP8b4FJrBZ9WqVxudCIzeieH3DGub5a+t3lpd/3NBfi9XhFxP2AdHvXWFH3uKkHXJYLrOnZzQxQo= +SHA256 (Pkgfile) = 04d27d4a80268185fc5113321c4ff3fbdf15d4ec5c86dd20b8e0e02a99d63069 +SHA256 (.footprint) = ba4288929999b528c1acda8c4fe362a9b7b2df6f062e66213383fb7da903f5ab +SHA256 (llvm-6.0.1.src.tar.xz) = b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2 diff --git a/llvm-32/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch b/llvm-32/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch deleted file mode 100644 index 02861ac..0000000 --- a/llvm-32/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4d613a84ce271c6225068bef67d727ae02b2e3b1 Mon Sep 17 00:00:00 2001 -From: Pavel Labath <labath(a)google.com> -Date: Wed, 14 Mar 2018 09:28:38 +0000 -Subject: [PATCH] Export LLVM_DYLIB_COMPONENTS in LLVMConfig.cmake - -Summary: -This is needed so that external projects (e.g. a standalone build of -lldb) can link to the LLVM shared library via the USE_SHARED argument of -llvm_config. Without this, llvm_config would add LLVM to the link list, -but then also add the constituent static libraries, resulting in -multiply defined symbols. - -Reviewers: beanz, mgorny - -Subscribers: llvm-commits - -Differential Revision: https://reviews.llvm.org/D44391 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327484 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - cmake/modules/LLVMConfig.cmake.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in -index fe4df5278498..e70018679846 100644 ---- a/cmake/modules/LLVMConfig.cmake.in -+++ b/cmake/modules/LLVMConfig.cmake.in -@@ -13,6 +13,8 @@ set(LLVM_COMMON_DEPENDS @LLVM_COMMON_DEPENDS@) - - set(LLVM_AVAILABLE_LIBS @LLVM_AVAILABLE_LIBS@) - -+set(LLVM_DYLIB_COMPONENTS @LLVM_DYLIB_COMPONENTS@) -+ - set(LLVM_ALL_TARGETS @LLVM_ALL_TARGETS@) - - set(LLVM_TARGETS_TO_BUILD @LLVM_TARGETS_TO_BUILD@) diff --git a/llvm-32/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch b/llvm-32/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch deleted file mode 100644 index 8303b10..0000000 --- a/llvm-32/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cmake/modules/LLVM-Config.cmake -=================================================================== ---- cmake/modules/LLVM-Config.cmake -+++ cmake/modules/LLVM-Config.cmake -@@ -68,7 +68,7 @@ - cmake_parse_arguments(ARG "USE_SHARED" "" "" ${ARGN}) - set(link_components ${ARG_UNPARSED_ARGUMENTS}) - -- if(USE_SHARED) -+ if(ARG_USE_SHARED) - # If USE_SHARED is specified, then we link against libLLVM, - # but also against the component libraries below. This is - # done in case libLLVM does not contain all of the components diff --git a/llvm-32/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch b/llvm-32/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch deleted file mode 100644 index fb758bc..0000000 --- a/llvm-32/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c9054610e354340f9474dcd13a927f929912d1d Mon Sep 17 00:00:00 2001 -From: Eugene Zelenko <eugene.zelenko(a)gmail.com> -Date: Tue, 6 Mar 2018 23:06:13 +0000 -Subject: [PATCH] [Transforms] Add missing header for InstructionCombining.cpp, - in order to export LLVMInitializeInstCombine as extern "C". Fixes PR35947. - -Patch by Brenton Bostick. - -Differential revision: https://reviews.llvm.org/D44140 - - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326843 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Transforms/InstCombine/InstructionCombining.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp -index a3b2fe9e5d22..7ec73433e8f6 100644 ---- a/lib/Transforms/InstCombine/InstructionCombining.cpp -+++ b/lib/Transforms/InstCombine/InstructionCombining.cpp -@@ -34,6 +34,7 @@ - //===----------------------------------------------------------------------===// - - #include "InstCombineInternal.h" -+#include "llvm-c/Initialization.h" - #include "llvm/ADT/APInt.h" - #include "llvm/ADT/ArrayRef.h" - #include "llvm/ADT/DenseMap.h" diff --git a/llvm-32/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch b/llvm-32/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch deleted file mode 100644 index 1841cf5..0000000 --- a/llvm-32/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 783006ec19853403b8fe799e4c1b9496cb03504a Mon Sep 17 00:00:00 2001 -From: Bjorn Pettersson <bjorn.a.pettersson(a)ericsson.com> -Date: Tue, 6 Mar 2018 08:47:07 +0000 -Subject: [PATCH] [DebugInfo] Discard invalid DBG_VALUE instructions in - LiveDebugVariables - -Summary: -This is a workaround for pr36417 -https://bugs.llvm.org/show_bug.cgi?id=36417 - -LiveDebugVariables will now verify that the DBG_VALUE instructions -are sane (prior to register allocation) by asking LIS if a virtual -register used in the DBG_VALUE is live (or dead def) in the slot -index before the DBG_VALUE. If it isn't sane the DBG_VALUE is -discarded. - -One pass that was identified as introducing non-sane DBG_VALUE -instructtons, when analysing pr36417, was the DAG->DAG Instruction -Selection. It sometimes inserts DBG_VALUE instructions referring to -a virtual register that is defined later in the same basic block. -So it is a use before def kind of problem. The DBG_VALUE is -typically inserted in the beginning of a basic block when this -happens. The problem can be seen in the test case -test/DebugInfo/X86/dbg-value-inlined-parameter.ll - -Reviewers: aprantl, rnk, probinson - -Reviewed By: aprantl - -Subscribers: vsk, davide, alexcrichton, Ka-Ka, eraman, llvm-commits, JDevlieghere - -Differential Revision: https://reviews.llvm.org/D43956 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326769 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/CodeGen/LiveDebugVariables.cpp | 38 +++++- - test/DebugInfo/X86/dbg-value-inlined-parameter.ll | 6 +- - .../X86/live-debug-vars-discard-invalid.mir | 141 +++++++++++++++++++++ - 3 files changed, 181 insertions(+), 4 deletions(-) - create mode 100644 test/DebugInfo/X86/live-debug-vars-discard-invalid.mir - -diff --git a/lib/CodeGen/LiveDebugVariables.cpp b/lib/CodeGen/LiveDebugVariables.cpp -index 09168b6b9309..f3fcd004defd 100644 ---- a/lib/CodeGen/LiveDebugVariables.cpp -+++ b/lib/CodeGen/LiveDebugVariables.cpp -@@ -514,6 +514,39 @@ bool LDVImpl::handleDebugValue(MachineInstr &MI, SlotIndex Idx) { - return false; - } - -+ // Detect invalid DBG_VALUE instructions, with a debug-use of a virtual -+ // register that hasn't been defined yet. If we do not remove those here, then -+ // the re-insertion of the DBG_VALUE instruction after register allocation -+ // will be incorrect. -+ // TODO: If earlier passes are corrected to generate sane debug information -+ // (and if the machine verifier is improved to catch this), then these checks -+ // could be removed or replaced by asserts. -+ bool Discard = false; -+ if (MI.getOperand(0).isReg() && -+ TargetRegisterInfo::isVirtualRegister(MI.getOperand(0).getReg())) { -+ const unsigned Reg = MI.getOperand(0).getReg(); -+ if (!LIS->hasInterval(Reg)) { -+ // The DBG_VALUE is described by a virtual register that does not have a -+ // live interval. Discard the DBG_VALUE. -+ Discard = true; -+ DEBUG(dbgs() << "Discarding debug info (no LIS interval): " -+ << Idx << " " << MI); -+ } else { -+ // The DBG_VALUE is only valid if either Reg is live out from Idx, or Reg -+ // is defined dead at Idx (where Idx is the slot index for the instruction -+ // preceeding the DBG_VALUE). -+ const LiveInterval &LI = LIS->getInterval(Reg); -+ LiveQueryResult LRQ = LI.Query(Idx); -+ if (!LRQ.valueOutOrDead()) { -+ // We have found a DBG_VALUE with the value in a virtual register that -+ // is not live. Discard the DBG_VALUE. -+ Discard = true; -+ DEBUG(dbgs() << "Discarding debug info (reg not live): " -+ << Idx << " " << MI); -+ } -+ } -+ } -+ - // Get or create the UserValue for (variable,offset) here. - bool IsIndirect = MI.getOperand(1).isImm(); - if (IsIndirect) -@@ -522,7 +555,10 @@ bool LDVImpl::handleDebugValue(MachineInstr &MI, SlotIndex Idx) { - const DIExpression *Expr = MI.getDebugExpression(); - UserValue *UV = - getUserValue(Var, Expr, MI.getDebugLoc()); -- UV->addDef(Idx, MI.getOperand(0), IsIndirect); -+ if (!Discard) -+ UV->addDef(Idx, MI.getOperand(0), IsIndirect); -+ else -+ UV->addDef(Idx, MachineOperand::CreateReg(0U, RegState::Debug), false); - return true; - } - -diff --git a/test/DebugInfo/X86/dbg-value-inlined-parameter.ll b/test/DebugInfo/X86/dbg-value-inlined-parameter.ll -index 9954039654bb..e83cf0aa7ffd 100644 ---- a/test/DebugInfo/X86/dbg-value-inlined-parameter.ll -+++ b/test/DebugInfo/X86/dbg-value-inlined-parameter.ll -@@ -32,10 +32,10 @@ - ;CHECK-NEXT: DW_AT_call_line - - ;CHECK: DW_TAG_formal_parameter --;FIXME: Linux shouldn't drop this parameter either... - ;CHECK-NOT: DW_TAG --;DARWIN: DW_AT_abstract_origin {{.*}} "sp" --;DARWIN: DW_TAG_formal_parameter -+;FIXME: Shouldn't drop this parameter... -+;XCHECK: DW_AT_abstract_origin {{.*}} "sp" -+;XCHECK: DW_TAG_formal_parameter - ;CHECK: DW_AT_abstract_origin {{.*}} "nums" - ;CHECK-NOT: DW_TAG_formal_parameter - -diff --git a/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir b/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir -new file mode 100644 -index 000000000000..abc21bc6ac90 ---- /dev/null -+++ b/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir -@@ -0,0 +1,141 @@ -+# RUN: llc -mtriple=x86_64-linux-gnu -start-before greedy -stop-after virtregrewriter -o - %s | FileCheck %s -+ -+--- | -+ ; ModuleID = '<stdin>' -+ source_filename = "test/DebugInfo/X86/dbg-value-inlined-parameter.ll" -+ target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" -+ target triple = "x86_64-apple-darwin" -+ -+ %struct.S1 = type { float*, i32 } -+ -+ @p = common global %struct.S1 zeroinitializer, align 8, !dbg !0 -+ -+ ; Function Attrs: nounwind optsize ssp -+ define void @foobar() !dbg !15 { -+ entry: -+ tail call void @llvm.dbg.value(metadata %struct.S1* @p, metadata !18, metadata !DIExpression()) , !dbg !25 -+ ret void, !dbg !32 -+ } -+ -+ ; Function Attrs: nounwind readnone speculatable -+ declare void @llvm.dbg.value(metadata, metadata, metadata) #2 -+ -+ !llvm.dbg.cu = !{!2} -+ !llvm.module.flags = !{!14} -+ -+ !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression()) -+ !1 = !DIGlobalVariable(name: "p", scope: !2, file: !3, line: 14, type: !6, isLocal: false, isDefinition: true) -+ !2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 2.9 (trunk 125693)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !4, globals: !5, imports: !4) -+ !3 = !DIFile(filename: "nm2.c", directory: "/private/tmp") -+ !4 = !{} -+ !5 = !{!0} -+ !6 = !DIDerivedType(tag: DW_TAG_typedef, name: "S1", scope: !2, file: !3, line: 4, baseType: !7) -+ !7 = !DICompositeType(tag: DW_TAG_structure_type, name: "S1", scope: !2, file: !3, line: 1, size: 128, align: 64, elements: !8) -+ !8 = !{!9, !12} -+ !9 = !DIDerivedType(tag: DW_TAG_member, name: "m", scope: !3, file: !3, line: 2, baseType: !10, size: 64, align: 64) -+ !10 = !DIDerivedType(tag: DW_TAG_pointer_type, scope: !2, baseType: !11, size: 64, align: 64) -+ !11 = !DIBasicType(name: "float", size: 32, align: 32, encoding: DW_ATE_float) -+ !12 = !DIDerivedType(tag: DW_TAG_member, name: "nums", scope: !3, file: !3, line: 3, baseType: !13, size: 32, align: 32, offset: 64) -+ !13 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -+ !14 = !{i32 1, !"Debug Info Version", i32 3} -+ !15 = distinct !DISubprogram(name: "foobar", scope: !3, file: !3, line: 15, type: !16, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, unit: !2) -+ !16 = !DISubroutineType(types: !17) -+ !17 = !{null} -+ !18 = !DILocalVariable(name: "sp", arg: 1, scope: !19, file: !3, line: 7, type: !24) -+ !19 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 8, type: !20, isLocal: false, isDefinition: true, scopeLine: 8, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, unit: !2, variables: !22) -+ !20 = !DISubroutineType(types: !21) -+ !21 = !{!13} -+ !22 = !{!18, !23} -+ !23 = !DILocalVariable(name: "nums", arg: 2, scope: !19, file: !3, line: 7, type: !13) -+ !24 = !DIDerivedType(tag: DW_TAG_pointer_type, scope: !2, baseType: !6, size: 64, align: 64) -+ !25 = !DILocation(line: 7, column: 13, scope: !19, inlinedAt: !26) -+ !26 = !DILocation(line: 16, column: 3, scope: !27) -+ !27 = distinct !DILexicalBlock(scope: !15, file: !3, line: 15, column: 15) -+ !32 = !DILocation(line: 17, column: 1, scope: !27) -+ -+... -+--- -+name: foobar -+tracksRegLiveness: true -+body: | -+ bb.0: -+ %1:gr64 = IMPLICIT_DEF -+ %2:gr64 = IMPLICIT_DEF -+ -+ bb.1: -+ ; This DBG_VALUE will be discarded (use before def of %0). -+ DBG_VALUE debug-use %0, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %0:gr64 = IMPLICIT_DEF -+ %0:gr64 = IMPLICIT_DEF -+ %0:gr64 = IMPLICIT_DEF -+ %0:gr64 = IMPLICIT_DEF -+ -+ bb.2: -+ ; This DBG_VALUE will be discarded (%1 is defined earlier, but it is not live in, so we do not know where %1 is stored). -+ DBG_VALUE debug-use %1, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %1:gr64 = IMPLICIT_DEF -+ %1:gr64 = IMPLICIT_DEF -+ %1:gr64 = IMPLICIT_DEF -+ %1:gr64 = IMPLICIT_DEF -+ ; This DBG_VALUE is kept, even if %1 is dead, it was defined in the prev instruction, -+ ; so the value should be available for as long as the register allocated to %1 is live. -+ DBG_VALUE debug-use %1, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ -+ bb.3: -+ %1:gr64 = IMPLICIT_DEF -+ DBG_VALUE 0, debug-use %noreg, !23, !DIExpression(), debug-location !25 -+ ; This DBG_VALUE is kept, even if %1 is dead, it was defined in the prev non-dbg instruction, -+ ; so the value should be available for as long as the register allocated to %1 is live. -+ DBG_VALUE debug-use %1, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ -+ bb.4: -+ ; All DBG_VALUEs here should survive. %2 is livein as it was defined in bb.0, and it has use/def in the BTS64rr instruction. -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %2:gr64 = BTS64rr %2, 0, implicit-def %eflags -+ DBG_VALUE 0, debug-use %noreg, !23, !DIExpression(), debug-location !25 -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %2:gr64 = BTS64rr %2, 0, implicit-def %eflags -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ %2:gr64 = BTS64rr %2, 0, implicit-def %eflags -+ DBG_VALUE debug-use %2, debug-use %noreg, !18, !DIExpression(), debug-location !25 -+ -+ bb.5: -+ RET 0, debug-location !32 -+... -+ -+# CHECK-LABEL: name: foobar -+ -+# CHECK-LABEL: bb.1: -+## After solving https://bugs.llvm.org/show_bug.cgi?id=36579 we expect to get a -+## DBG_VALUE debug-use %noreg -+## here. -+# CHECK-NOT: DBG_VALUE -+ -+# CHECK-LABEL: bb.2: -+## After solving https://bugs.llvm.org/show_bug.cgi?id=36579 we expect to get a -+## DBG_VALUE debug-use %noreg -+## here. -+# CHECK-NOT: DBG_VALUE -+# CHECK: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: DBG_VALUE debug-use %rcx, debug-use %noreg, !18, !DIExpression() -+ -+# CHECK-LABEL: bb.3: -+# CHECK: dead renamable %rcx = IMPLICIT_DEF -+# CHECK-NEXT: DBG_VALUE 0, debug-use %noreg, !23, !DIExpression() -+# CHECK-NEXT: DBG_VALUE debug-use %rcx, debug-use %noreg, !18, !DIExpression() -+ -+# CHECK-LABEL: bb.4: -+# CHECK: liveins: %rax -+# CHECK: DBG_VALUE debug-use %rax, debug-use %noreg, !18, !DIExpression() -+# CHECK-NEXT: renamable %rax = BTS64rr killed renamable %rax, 0, implicit-def %eflags -+# CHECK-NEXT: DBG_VALUE 0, debug-use %noreg, !23, !DIExpression() -+# CHECK-NEXT: DBG_VALUE debug-use %rax, debug-use %noreg, !18, !DIExpression() -+# CHECK-NEXT: renamable %rax = BTS64rr killed renamable %rax, 0, implicit-def %eflags -+# CHECK-NEXT: DBG_VALUE debug-use %rax, debug-use %noreg, !18, !DIExpression() -+# CHECK-NEXT: dead renamable %rax = BTS64rr killed renamable %rax, 0, implicit-def %eflags -+ -+# CHECK-LABEL: bb.5: -+# CHECK-NEXT: RET 0 diff --git a/llvm-32/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch b/llvm-32/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch deleted file mode 100644 index 602e6ac..0000000 --- a/llvm-32/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 866cf8f3afa0224e31d36ca0351ac5cb0d303757 Mon Sep 17 00:00:00 2001 -From: Bjorn Pettersson <bjorn.a.pettersson(a)ericsson.com> -Date: Tue, 6 Mar 2018 13:23:28 +0000 -Subject: [PATCH] Fixup for rL326769 (RegState::Debug is being truncated to a - bool) - -I obviously messed up arguments to MachineOperand::CreateReg -in rL326769. This should make it work as intended. - -Thanks to RKSimon for spotting this. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326780 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/CodeGen/LiveDebugVariables.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/lib/CodeGen/LiveDebugVariables.cpp b/lib/CodeGen/LiveDebugVariables.cpp -index f3fcd004defd..8c547cdcff33 100644 ---- a/lib/CodeGen/LiveDebugVariables.cpp -+++ b/lib/CodeGen/LiveDebugVariables.cpp -@@ -557,8 +557,11 @@ bool LDVImpl::handleDebugValue(MachineInstr &MI, SlotIndex Idx) { - getUserValue(Var, Expr, MI.getDebugLoc()); - if (!Discard) - UV->addDef(Idx, MI.getOperand(0), IsIndirect); -- else -- UV->addDef(Idx, MachineOperand::CreateReg(0U, RegState::Debug), false); -+ else { -+ MachineOperand MO = MachineOperand::CreateReg(0U, false); -+ MO.setIsDebug(); -+ UV->addDef(Idx, MO, false); -+ } - return true; - } - diff --git a/llvm-32/Pkgfile b/llvm-32/Pkgfile index 07185a4..1fd60dc 100644 --- a/llvm-32/Pkgfile +++ b/llvm-32/Pkgfile @@ -4,35 +4,18 @@ # Depends on: libffi-32 python-32 llvm name=llvm-32 -version=6.0.0 -release=2 -source=(https://llvm.org/releases/$version/llvm-$version.src.tar.xz - PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch - PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch - PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch - D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch - D44420-cmake-fix-a-typo-in-llvm_config-macro.patch) +version=6.0.1 +release=1 +source=(https://llvm.org/releases/$version/llvm-$version.src.tar.xz) build() { cd llvm-$version.src - # https://bugs.llvm.org/show_bug.cgi?id=35947 - patch -p1 -i $SRC/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch - - # https://bugs.llvm.org/show_bug.cgi?id=36417 - patch -p1 -i $SRC/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch - patch -p1 -i $SRC/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch - - # https://reviews.llvm.org/D44391 - patch -p1 -i $SRC/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch - - # https://reviews.llvm.org/D44420 - patch -p0 -i $SRC/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch - install -d build $SRC/keep cd build - cmake \ + cmake .. -G Ninja \ + -DLLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \ -DLLVM_ENABLE_CXX1Y=1 \ -DLLVM_INCLUDE_EXAMPLES=0 \ -DLLVM_ENABLE_OCAMLDOC=0 \ @@ -44,10 +27,10 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_LIBDIR_SUFFIX=32 \ -DLLVM_TARGET=i686-pc-linux-gnu \ - -Wno-dev .. + -Wno-dev - MAKEFLAGS="$MAKEFLAGS" make - make DESTDIR=$PKG install + ninja + DESTDIR=$PKG ninja install # keep 32bit header and config install -t $SRC/keep $PKG/usr/bin/llvm-config $PKG/usr/include/llvm/Config/llvm-config.h

1 0

ports/contrib (3.4): nginx: updated to version 1.15.2
by crux＠crux.nu 25 Jul '18

25 Jul '18

commit 43c2a6237f2de99025d07a66d0fdf38095b75024 Author: Matt Housh <jaeger(a)crux.ninja> Date: Wed Jul 25 13:29:52 2018 -0500 nginx: updated to version 1.15.2 diff --git a/nginx/.md5sum b/nginx/.md5sum index cfa12bf0..a9f81e10 100644 --- a/nginx/.md5sum +++ b/nginx/.md5sum @@ -1,3 +1,3 @@ -2dd5a265c54a76b699443931d80a61b9 nginx-1.15.1.tar.gz +d063f746d3dc4298aed9c518f1684166 nginx-1.15.2.tar.gz 93b358681200fe294581cb559d529aee nginx.conf 06712aa2b72397850b0725f2e9d20627 nginx.rc diff --git a/nginx/.signature b/nginx/.signature index 40e78078..d9651d22 100644 --- a/nginx/.signature +++ b/nginx/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32rj4p31tVv6Z4goIfSdPHfez17V2BIQeMEWi3cHbkOTQ6gP2bEYBw1I9PZAHLzdqCT/l82p154YRiJ64FJ1cAE= -SHA256 (Pkgfile) = dd3658622154e22cd8574f337f28fa1ef0dd555e66e2916d1ae5277a8d38e667 +RWSagIOpLGJF3+eiHITrJcAzUw9gmAHaOVObFM/6sMWSIap+0mozaMZ2TX6eLc9LeNv8BWon67365r5SfFRMXQs+I0BVDJU8BgM= +SHA256 (Pkgfile) = 35952231edc8927473fc8281ad9ba3f0c9180d6efb801efa1b52cbf60371479a SHA256 (.footprint) = 9263dad4ce3a2766b5f9bec00a3a58ac86445f370ba1bb3d5716e6b9dc74ddae -SHA256 (nginx-1.15.1.tar.gz) = c7206858d7f832b8ef73a45c9b8f8e436bcb1ee88db2bc85b8e438ecec9d5460 +SHA256 (nginx-1.15.2.tar.gz) = eeba09aecfbe8277ac33a5a2486ec2d6731739f3c1c701b42a0c3784af67ad90 SHA256 (nginx.conf) = 0f9b54e790951f1a09580bbf29ede26c4cc277e535d4df937fc659979a2fb35b SHA256 (nginx.rc) = f90c90af425199ff3b56a65100448c014d1cd0a39e4737e2a8bcf869dd8dfb65 diff --git a/nginx/Pkgfile b/nginx/Pkgfile index 277766e1..bb045baf 100644 --- a/nginx/Pkgfile +++ b/nginx/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre zlib openssl name=nginx -version=1.15.1 +version=1.15.2 release=1 source=(http://nginx.org/download/$name-$version.tar.gz \ $name.conf $name.rc)

1 0