April 2018 - CRUX - lists.crux.nu

ports/core (3.3): [notify] perl: update to 5.24.4
by crux＠crux.nu 16 Apr '18

16 Apr '18

commit c52f30776a5d2d5ffd433ba3ad8d8dbb719fbb8e Author: Juergen Daubert <jue(a)jue.li> Date: Mon Apr 16 13:19:28 2018 +0200 [notify] perl: update to 5.24.4 security fixes, see https://github.com/Perl/perl5/blob/blead/pod/perl5244delta.pod diff --git a/perl/.footprint b/perl/.footprint index 99fcddab..000d2dd0 100644 --- a/perl/.footprint +++ b/perl/.footprint @@ -10,8 +10,8 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/instmodsh -rwxr-xr-x root/root usr/bin/json_pp -rwxr-xr-x root/root usr/bin/libnetcfg -lrwxrwxrwx root/root usr/bin/perl -> perl5.24.3 --rwxr-xr-x root/root usr/bin/perl5.24.3 +lrwxrwxrwx root/root usr/bin/perl -> perl5.24.4 +-rwxr-xr-x root/root usr/bin/perl5.24.4 -rwxr-xr-x root/root usr/bin/perlbug -rwxr-xr-x root/root usr/bin/perldoc -rwxr-xr-x root/root usr/bin/perlivp @@ -1154,6 +1154,7 @@ drwxr-xr-x root/root usr/lib/perl5/5.24/pod/ -rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl5241delta.pod -rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl5242delta.pod -rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl5243delta.pod +-rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl5244delta.pod -rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl561delta.pod -rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl56delta.pod -rw-r--r-- root/root usr/lib/perl5/5.24/pod/perl581delta.pod @@ -1898,6 +1899,7 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/perl5241delta.1pm.gz -rw-r--r-- root/root usr/share/man/man1/perl5242delta.1pm.gz -rw-r--r-- root/root usr/share/man/man1/perl5243delta.1pm.gz +-rw-r--r-- root/root usr/share/man/man1/perl5244delta.1pm.gz -rw-r--r-- root/root usr/share/man/man1/perl561delta.1pm.gz -rw-r--r-- root/root usr/share/man/man1/perl56delta.1pm.gz -rw-r--r-- root/root usr/share/man/man1/perl581delta.1pm.gz diff --git a/perl/.md5sum b/perl/.md5sum index 730e11ff..13d6d8cc 100644 --- a/perl/.md5sum +++ b/perl/.md5sum @@ -1 +1 @@ -e960a8e9f6585205cacb913e97657cb6 perl-5.24.3.tar.xz +04622bc4d3941dc7eb571c52b7c02993 perl-5.24.4.tar.xz diff --git a/perl/.signature b/perl/.signature index c3d16728..2ae30b7e 100644 --- a/perl/.signature +++ b/perl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqoveGg686J4Fdxuwt01FLQLHRFqgzmraA1A/1sOSUQPeDEdfKUXmZXs3/kkll8fA5W6Wp6RJGtbFNToGV+7ErAA= -SHA256 (Pkgfile) = 6b787c0558b2aaa8989782eeaaa4ced05f237aec07794b99cd8f3a67815bffe9 -SHA256 (.footprint) = 818c072ae97decda84517938aa907dde42b2cd299086f588512fd0cefd9530b1 -SHA256 (perl-5.24.3.tar.xz) = 03fe3e4ea39d2a4982703572599a80f3d5f368a1359ed89746ea1d8bec6cfbba +RWRJc1FUaeVeqpNd7nDPXKFfqN4AAdsMuCQT5qxbZrFE2GjL54mLwQiJj/JSMBfuMrKY2pm7KOFumqWcGYVzqG80WWAsrfJf1Qc= +SHA256 (Pkgfile) = f3c2ef5dace82704aea49e541f4f9ea6641e94ceb91e0c02460402fb5e03231d +SHA256 (.footprint) = 39a69de37c1b5fe50540f757a8084b1058c47a541aebb3b0776035371b0bf699 +SHA256 (perl-5.24.4.tar.xz) = 7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 diff --git a/perl/Pkgfile b/perl/Pkgfile index d3203ab8..0cf175d5 100644 --- a/perl/Pkgfile +++ b/perl/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db gdbm name=perl -version=5.24.3 +version=5.24.4 release=1 source=(http://www.cpan.org/src/5.0/$name-$version.tar.xz)

1 0

ports/opt (3.3): [notify] python3-pip: world writable files fixed
by crux＠crux.nu 15 Apr '18

15 Apr '18

commit 827328538ee605be3b1c49b79b382344d2767376 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Apr 15 20:59:09 2018 +1000 [notify] python3-pip: world writable files fixed diff --git a/python3-pip/.footprint b/python3-pip/.footprint index c59c66d17..c7810cad1 100644 --- a/python3-pip/.footprint +++ b/python3-pip/.footprint @@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.6/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/ --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/PKG-INFO --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/SOURCES.txt --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/dependency_links.txt --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/entry_points.txt --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/not-zip-safe --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/requires.txt --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip-10.0.0-py3.6.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/__init__.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/__main__.py @@ -289,7 +289,7 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/__pycac -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/__pycache__/__main__.cpython-36.pyc -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/__pycache__/core.cpython-36.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/__pycache__/core.cpython-36.pyc --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/cacert.pem +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/cacert.pem -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/certifi/core.py drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/chardet/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/chardet/__init__.py @@ -482,7 +482,7 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backpo -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/__pycache__/tarfile.cpython-36.pyc -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/misc.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/shutil.py --rw-rw-rw- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/sysconfig.cfg +-rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/sysconfig.cfg -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/sysconfig.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backport/tarfile.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/compat.py @@ -494,12 +494,12 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/_backpo -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/metadata.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/resources.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/scripts.py --rwxrwxrwx root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/t32.exe --rwxrwxrwx root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/t64.exe +-rwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/t32.exe +-rwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/t64.exe -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/util.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/version.py --rwxrwxrwx root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/w32.exe --rwxrwxrwx root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/w64.exe +-rwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/w32.exe +-rwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/w64.exe -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distlib/wheel.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/pip/_vendor/distro.py drwxr-xr-x root/root usr/lib/python3.6/site-packages/pip/_vendor/html5lib/ diff --git a/python3-pip/.signature b/python3-pip/.signature index b2cc4108b..78af5a635 100644 --- a/python3-pip/.signature +++ b/python3-pip/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Y4OKkMJPU8JPhI2/PczpoF6S+uAyAvFe96LScNEQv9LXc8T4F36THgd3Y2LJR8evQiC0UINxFCbynKNOznhxgA= -SHA256 (Pkgfile) = f32cec0d09497173ce21d0ac8d188bc0b571032c87213bd3c9ab51354a208072 -SHA256 (.footprint) = 7219f4484602934af9fcb2d73962b184f6ae3f1ee0fddf7aaec6bb6b6a2f0708 +RWSE3ohX2g5d/Y2PrupwslOpW6XKgOP/1QattHFdeXpykQY1jSTn/MYu5Vh+LxAqT9rWhYvTIJzY1DwQOlzZJzmC5awl1LOmAQE= +SHA256 (Pkgfile) = 3eb71dc3e53a07dbd9f921514be132c6fad3923e192133fd60f5a8546a993390 +SHA256 (.footprint) = e717e59ccb37866e5d7994f82500d8ed0e0d64e21a8ada54845e7204b0f12471 SHA256 (pip-10.0.0.tar.gz) = f05a3eeea64bce94e85cc6671d679473d66288a4d37c3fcf983584954096b34f SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python3-pip/Pkgfile b/python3-pip/Pkgfile index aaa424b8a..2820360a9 100644 --- a/python3-pip/Pkgfile +++ b/python3-pip/Pkgfile @@ -5,7 +5,7 @@ name=python3-pip version=10.0.0 -release=1 +release=2 source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*… https://crux.ster.zone/downloads/get-pip.py # https://bootstrap.pypa.io/get-pip.py @@ -41,4 +41,5 @@ Please prt-get depinst python3-setuptools to use $name.\033[0m\n" fi rm $PKG/usr/bin/pip + chmod -R og-w $PKG }

1 0

ports/opt (3.3): [notify] python-pip: world writable files fixed
by crux＠crux.nu 15 Apr '18

15 Apr '18

commit 7597c9a97485a1bcf9e8dcd1a959a027436111c4 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Apr 15 20:58:36 2018 +1000 [notify] python-pip: world writable files fixed diff --git a/python-pip/.footprint b/python-pip/.footprint index c3ae29577..df3075669 100644 --- a/python-pip/.footprint +++ b/python-pip/.footprint @@ -7,13 +7,13 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/ --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/PKG-INFO --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/SOURCES.txt --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/dependency_links.txt --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/entry_points.txt --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/not-zip-safe --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/requires.txt --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip-10.0.0-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/__init__.pyc @@ -266,7 +266,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/__main__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/__main__.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/__main__.pyo --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/cacert.pem +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/cacert.pem -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/core.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/core.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/certifi/core.pyo @@ -428,7 +428,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backpo -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/shutil.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/shutil.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/shutil.pyo --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/sysconfig.cfg +-rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/sysconfig.cfg -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/sysconfig.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/sysconfig.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backport/sysconfig.pyo @@ -462,16 +462,16 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/_backpo -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/scripts.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/scripts.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/scripts.pyo --rwxrwxrwx root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/t32.exe --rwxrwxrwx root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/t64.exe +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/t32.exe +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/t64.exe -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/util.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/util.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/util.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/version.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/version.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/version.pyo --rwxrwxrwx root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/w32.exe --rwxrwxrwx root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/w64.exe +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/w32.exe +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/w64.exe -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/wheel.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/wheel.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pip/_vendor/distlib/wheel.pyo diff --git a/python-pip/.signature b/python-pip/.signature index 54443ea76..b20ded300 100644 --- a/python-pip/.signature +++ b/python-pip/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WiOrG39gnEgU06fUg/2eT+aDA7DJjnki12QwP2BdX30YmaT1P3GsnCBZd/HyU6OtE6Chtsp930jxLRyEa/fIAs= -SHA256 (Pkgfile) = 1d2cd55dfbbc55bbe41d134c42a5a2f7550049f4576c5a69b4f17410e013c059 -SHA256 (.footprint) = 7ad3f6078082009962f0ff629f6ad373f7f123dd338655bdaa546db80be90019 +RWSE3ohX2g5d/YqgKTTLL7qlbeTYCivm/w3710CTZiZgGbwN200o4vAxKbV+tGK2T0B+m5+bnqBD2Ct3JYkkELmR3IvirBvlBAw= +SHA256 (Pkgfile) = 2bd553c5470b944dc87c3e18e770e4362d9dc0ee2ab95a19a6b662ee85bf033b +SHA256 (.footprint) = 9707d099a11c0378522206af0f95182cdd0e089e55f50df68e8d941c20c7d4cb SHA256 (pip-10.0.0.tar.gz) = f05a3eeea64bce94e85cc6671d679473d66288a4d37c3fcf983584954096b34f SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python-pip/Pkgfile b/python-pip/Pkgfile index f3c0fca24..43bd9f72e 100644 --- a/python-pip/Pkgfile +++ b/python-pip/Pkgfile @@ -5,7 +5,7 @@ name=python-pip version=10.0.0 -release=1 +release=2 source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*… https://crux.ster.zone/downloads/get-pip.py # https://bootstrap.pypa.io/get-pip.py @@ -39,4 +39,6 @@ Please prt-get depinst python-setuptools to use $name.\033[0m\n" /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 fi + + chmod -R og-w $PKG }

1 0

ports/compat-32 (3.4): [notify] llvm-32: upstream bug fix patches
by crux＠crux.nu 14 Apr '18

14 Apr '18

commit b59ba1943d25c165096d0c71dc4a8edc86b20431 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Apr 13 08:50:44 2018 +1000 [notify] llvm-32: upstream bug fix patches diff --git a/llvm-32/.md5sum b/llvm-32/.md5sum index bca22c7..025390d 100644 --- a/llvm-32/.md5sum +++ b/llvm-32/.md5sum @@ -1 +1,6 @@ +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 diff --git a/llvm-32/.signature b/llvm-32/.signature index 059feb3..015b2c0 100644 --- a/llvm-32/.signature +++ b/llvm-32/.signature @@ -1,5 +1,10 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXZAIY47gCPbSatpo2zsz2hZgri7UwbZzFZHRHntGpvSIaVZVnRGMVrBOAK0MmEwu4jC+RWuVfrerL217lX6N3Q8= -SHA256 (Pkgfile) = a365c50146ca8ac7cb041714e81ab66d08b202056a814de1feca46dd06c38034 +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 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 new file mode 100644 index 0000000..02861ac --- /dev/null +++ b/llvm-32/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 0000000..8303b10 --- /dev/null +++ b/llvm-32/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..fb758bc --- /dev/null +++ b/llvm-32/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..1841cf5 --- /dev/null +++ b/llvm-32/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch @@ -0,0 +1,262 @@ +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 new file mode 100644 index 0000000..602e6ac --- /dev/null +++ b/llvm-32/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch @@ -0,0 +1,34 @@ +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 1f21003..07185a4 100644 --- a/llvm-32/Pkgfile +++ b/llvm-32/Pkgfile @@ -5,12 +5,30 @@ name=llvm-32 version=6.0.0 -release=1 -source=(https://llvm.org/releases/$version/llvm-$version.src.tar.xz) +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) 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

1 0

ports/compat-32 (3.3): [notify] llvm-32: upstream bug fix patches
by crux＠crux.nu 12 Apr '18

12 Apr '18

commit b59ba1943d25c165096d0c71dc4a8edc86b20431 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Apr 13 08:50:44 2018 +1000 [notify] llvm-32: upstream bug fix patches diff --git a/llvm-32/.md5sum b/llvm-32/.md5sum index bca22c7..025390d 100644 --- a/llvm-32/.md5sum +++ b/llvm-32/.md5sum @@ -1 +1,6 @@ +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 diff --git a/llvm-32/.signature b/llvm-32/.signature index 059feb3..015b2c0 100644 --- a/llvm-32/.signature +++ b/llvm-32/.signature @@ -1,5 +1,10 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXZAIY47gCPbSatpo2zsz2hZgri7UwbZzFZHRHntGpvSIaVZVnRGMVrBOAK0MmEwu4jC+RWuVfrerL217lX6N3Q8= -SHA256 (Pkgfile) = a365c50146ca8ac7cb041714e81ab66d08b202056a814de1feca46dd06c38034 +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 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 new file mode 100644 index 0000000..02861ac --- /dev/null +++ b/llvm-32/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 0000000..8303b10 --- /dev/null +++ b/llvm-32/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..fb758bc --- /dev/null +++ b/llvm-32/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..1841cf5 --- /dev/null +++ b/llvm-32/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch @@ -0,0 +1,262 @@ +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 new file mode 100644 index 0000000..602e6ac --- /dev/null +++ b/llvm-32/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch @@ -0,0 +1,34 @@ +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 1f21003..07185a4 100644 --- a/llvm-32/Pkgfile +++ b/llvm-32/Pkgfile @@ -5,12 +5,30 @@ name=llvm-32 version=6.0.0 -release=1 -source=(https://llvm.org/releases/$version/llvm-$version.src.tar.xz) +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) 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

1 0

ports/opt (3.4): [notify] llvm: upstream bug fix patches
by crux＠crux.nu 12 Apr '18

12 Apr '18

commit df5825191cc809b02f692ad4c630077b00c10131 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Apr 13 01:02:27 2018 +1000 [notify] llvm: upstream bug fix patches diff --git a/llvm/.md5sum b/llvm/.md5sum index 8638b2afb..7b2c39085 100644 --- a/llvm/.md5sum +++ b/llvm/.md5sum @@ -1,2 +1,7 @@ +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 a4a9aad94..b1d2eb9a1 100644 --- a/llvm/.signature +++ b/llvm/.signature @@ -1,6 +1,11 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SL0TpagjqcrCGh7eMxZGeqPtPjlcBUBFOYjJfpOFJt0kGtd+uaAbYSWSlKfDfaW5S7z6RbD2R2AYf3pszlU0AY= -SHA256 (Pkgfile) = 85d57068b3f168682abbd877b0c967c9947e7be9c5124913cd2308f192d25f7f +RWSE3ohX2g5d/WL0fEZIW4z61IYSRa7y7dR9+E5+D1ccJt41PT+/ZocXRId3bPsNSrtIjUmWas4bMpDgTP2qiVRnvMWQZyNwuA8= +SHA256 (Pkgfile) = d4f00216738b2451638834b3d4e00904b5447f3a632f97ab3d000c5a1e7d522a SHA256 (.footprint) = 9e55f99cca4f9100bfb4789d94b97878241f6c63560e17a390389d2b245d62c7 SHA256 (llvm-6.0.0.src.tar.xz) = 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 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 new file mode 100644 index 000000000..02861acf5 --- /dev/null +++ b/llvm/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 000000000..8303b10d0 --- /dev/null +++ b/llvm/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..fb758bcaf --- /dev/null +++ b/llvm/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 000000000..1841cf517 --- /dev/null +++ b/llvm/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch @@ -0,0 +1,262 @@ +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 new file mode 100644 index 000000000..602e6ac55 --- /dev/null +++ b/llvm/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch @@ -0,0 +1,34 @@ +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 bee3b62ce..ff5fa4e79 100644 --- a/llvm/Pkgfile +++ b/llvm/Pkgfile @@ -5,9 +5,14 @@ name=llvm version=6.0.0 -release=1 -source=(https://llvm.org/releases/$version/$name-$version.src.tar.xz \ - llvm-config.h) +release=2 +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) build() { export CC=gcc @@ -15,6 +20,19 @@ 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

1 0

ports/opt (3.3): [notify] llvm: upstream bug fix patches
by crux＠crux.nu 12 Apr '18

12 Apr '18

commit df5825191cc809b02f692ad4c630077b00c10131 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Apr 13 01:02:27 2018 +1000 [notify] llvm: upstream bug fix patches diff --git a/llvm/.md5sum b/llvm/.md5sum index 8638b2afb..7b2c39085 100644 --- a/llvm/.md5sum +++ b/llvm/.md5sum @@ -1,2 +1,7 @@ +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 a4a9aad94..b1d2eb9a1 100644 --- a/llvm/.signature +++ b/llvm/.signature @@ -1,6 +1,11 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SL0TpagjqcrCGh7eMxZGeqPtPjlcBUBFOYjJfpOFJt0kGtd+uaAbYSWSlKfDfaW5S7z6RbD2R2AYf3pszlU0AY= -SHA256 (Pkgfile) = 85d57068b3f168682abbd877b0c967c9947e7be9c5124913cd2308f192d25f7f +RWSE3ohX2g5d/WL0fEZIW4z61IYSRa7y7dR9+E5+D1ccJt41PT+/ZocXRId3bPsNSrtIjUmWas4bMpDgTP2qiVRnvMWQZyNwuA8= +SHA256 (Pkgfile) = d4f00216738b2451638834b3d4e00904b5447f3a632f97ab3d000c5a1e7d522a SHA256 (.footprint) = 9e55f99cca4f9100bfb4789d94b97878241f6c63560e17a390389d2b245d62c7 SHA256 (llvm-6.0.0.src.tar.xz) = 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 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 new file mode 100644 index 000000000..02861acf5 --- /dev/null +++ b/llvm/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 000000000..8303b10d0 --- /dev/null +++ b/llvm/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..fb758bcaf --- /dev/null +++ b/llvm/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 000000000..1841cf517 --- /dev/null +++ b/llvm/PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch @@ -0,0 +1,262 @@ +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 new file mode 100644 index 000000000..602e6ac55 --- /dev/null +++ b/llvm/PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch @@ -0,0 +1,34 @@ +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 bee3b62ce..ff5fa4e79 100644 --- a/llvm/Pkgfile +++ b/llvm/Pkgfile @@ -5,9 +5,14 @@ name=llvm version=6.0.0 -release=1 -source=(https://llvm.org/releases/$version/$name-$version.src.tar.xz \ - llvm-config.h) +release=2 +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) build() { export CC=gcc @@ -15,6 +20,19 @@ 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

1 0

ports/opt (3.4): [notify] dnsmasq: build with DNSSEC support, new dependency nettle
by crux＠crux.nu 10 Apr '18

10 Apr '18

commit e5d1848b4618b82e2fb4c7b0bf5322a3d5fb00e4 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Apr 10 10:25:58 2018 +0200 [notify] dnsmasq: build with DNSSEC support, new dependency nettle diff --git a/dnsmasq/.footprint b/dnsmasq/.footprint index c2683986f..4a41553f9 100644 --- a/dnsmasq/.footprint +++ b/dnsmasq/.footprint @@ -6,6 +6,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/dnsmasq drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/dnsmasq/ +-rw-r--r-- root/root usr/share/dnsmasq/trust-anchors.conf drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/dnsmasq.8.gz diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum index 736c95422..415adc805 100644 --- a/dnsmasq/.md5sum +++ b/dnsmasq/.md5sum @@ -1,3 +1,3 @@ cf2b6cff8356ce9da3f6da7dfa0e588b dnsmasq 64010c9734f5e275eb591374a6dad924 dnsmasq-2.79.tar.xz -21befd927fdef41cb6cb920e910ae258 dnsmasq-config.patch +45d15e18de066eee51829b59e89ffaff dnsmasq-config.patch diff --git a/dnsmasq/.signature b/dnsmasq/.signature index a2971aadb..bcebc820d 100644 --- a/dnsmasq/.signature +++ b/dnsmasq/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Smya1rJeKYLw8sGuc9RoFn2iB/h/cTqrIB1NqOjQ0DCQR3tKwzn4uEx1DMx5M+tdBjcV+w4h0RuMbEo7ncITAE= -SHA256 (Pkgfile) = 3f238835c17201301648d332858bb18b6bedf9bcbba4fb7fe10159018a00d933 -SHA256 (.footprint) = 0a67922c7b59eb4a638cf4582f91ea285eb9876696d5a0829a7c70a9c9cb9804 +RWSE3ohX2g5d/U7P0ZIOCl2XzD3nMDWl0C9wfO/2TMRmYaJvaApTgaDYZiRQnPFx6FFqhKbPuJaS+KXerYVPxZIFRxwWzTn/ew4= +SHA256 (Pkgfile) = 82409ad4c0241c3a66bf3d37e309994e6ed32f542accba3546b010543888ec02 +SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9 SHA256 (dnsmasq-2.79.tar.xz) = 78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f -SHA256 (dnsmasq-config.patch) = 79f524d34e7a77dfc59138a78d0df59504c0570ecceb23c06a1af97d34a4861c +SHA256 (dnsmasq-config.patch) = be6179b484cd8f37f6bdcdb14c119bcc2ff31901c0e5a22eab8f5feffedf542f SHA256 (dnsmasq) = 1550a45a85219d7e286f6c50d72d4794da27e7b78e6b482b8414f4cf8a4dbd7b diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 7516efdfb..260a062ec 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -1,10 +1,11 @@ # Description: Caching DNS forwarder and DHCP/TFTP server # URL: http://www.thekelleys.org.uk/dnsmasq/doc.html # Maintainer: Juergen Daubert, jue at crux dot nu +# Depends on: nettle name=dnsmasq version=2.79 -release=1 +release=2 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \ $name-config.patch dnsmasq) @@ -13,10 +14,12 @@ build () { patch -p1 -i $SRC/$name-config.patch - make - make PREFIX=$PKG/usr install + make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -Wall -W" + make COPTS="-DHAVE_DNSSEC" PREFIX=$PKG/usr install - install -D -m 755 $SRC/dnsmasq $PKG/etc/rc.d/dnsmasq + install -d $PKG/{var/lib/dhcp,etc/rc.d,usr/share/dnsmasq} + + install -m 755 $SRC/dnsmasq $PKG/etc/rc.d/ install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf - install -d $PKG/var/lib/dhcp + install -m 644 trust-anchors.conf $PKG/usr/share/dnsmasq } diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch index 377b6afc7..31fe58072 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,18 +1,15 @@ -diff -Nru dnsmasq-2.79.orig/Makefile dnsmasq-2.79/Makefile ---- dnsmasq-2.79.orig/Makefile 2018-03-18 18:32:53.591375434 +0100 -+++ dnsmasq-2.79/Makefile 2018-03-18 18:33:16.974452841 +0100 -@@ -24,7 +24,7 @@ - LOCALEDIR = $(PREFIX)/share/locale - BUILDDIR = $(SRC) - DESTDIR = --CFLAGS = -Wall -W -O2 -+CFLAGS += -Wall -W - LDFLAGS = - COPTS = - RPM_OPT_FLAGS = diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.example ---- dnsmasq-2.79.orig/dnsmasq.conf.example 2018-03-18 18:32:53.591375434 +0100 -+++ dnsmasq-2.79/dnsmasq.conf.example 2018-03-18 18:33:16.974452841 +0100 +--- dnsmasq-2.79.orig/dnsmasq.conf.example 2018-04-04 12:11:55.871714531 +0200 ++++ dnsmasq-2.79/dnsmasq.conf.example 2018-04-04 12:14:52.416900426 +0200 +@@ -22,7 +22,7 @@ + + # Uncomment these to enable DNSSEC validation and caching: + # (Requires dnsmasq to be built with DNSSEC option.) +-#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf ++#conf-file=/usr/share/dnsmasq/trust-anchors.conf + #dnssec + + # Replies which are not DNSSEC signed may be legitimate, because the domain @@ -96,8 +96,8 @@ # If you want dnsmasq to change uid and gid to something other @@ -29,13 +26,13 @@ diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.examp # This defaults to a sane location, but if you want to change it, use # the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases -+# dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases ++#dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, diff -Nru dnsmasq-2.79.orig/src/config.h dnsmasq-2.79/src/config.h ---- dnsmasq-2.79.orig/src/config.h 2018-03-18 18:32:53.591375434 +0100 -+++ dnsmasq-2.79/src/config.h 2018-03-18 18:33:16.974452841 +0100 +--- dnsmasq-2.79.orig/src/config.h 2018-04-04 12:11:55.868381226 +0200 ++++ dnsmasq-2.79/src/config.h 2018-04-04 12:12:12.708240101 +0200 @@ -44,7 +44,7 @@ #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */

1 0

Crux update partially unsuccessful
by Giorgio Cittadini 09 Apr '18

09 Apr '18

Hi all, I need your help owing to a problem that succeeds in confusing me very much. After about a month of delay, I tried to update my wonderful CRUX-kf5 OS (anyhow, absolutely well working), but I get no success for 15 packages (nearly all in KF5 port, and four - llvm, poppler, poppler-qt5, pango-32 - in other ports. The following is an example of what I get when trying: **************** # prt-get update kmenuedit prt-get: updating /usr/ports/kf5/kmenuedit =======> Downloading 'http://download.kde.org/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz'. --2018-04-09 08:00:56-- http://fileserver.intranet/crux/sources/kmenuedit-5.12.4.tar.xz Resolving fileserver.intranet... failed: Name or service not known. wget: unable to resolve host address 'fileserver.intranet' URL transformed to HTTPS due to an HSTS policy --2018-04-09 08:00:56-- https://download.kde.org/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz Resolving download.kde.org... 144.76.243.172, 2a01:4f8:200:93fb::3 Connecting to download.kde.org|144.76.243.172|:443... connected. HTTP request sent, awaiting response... 302 Found Location: http://ct.mirror.garr.it/mirrors/KDE/stable/plasma/5.12.4/kmenuedit-5.12.4.… [following] --2018-04-09 08:00:56-- http://ct.mirror.garr.it/mirrors/KDE/stable/plasma/5.12.4/kmenuedit-5.12.4.… Resolving ct.mirror.garr.it... 90.147.164.69, 2001:760:ffff:b7:5:100:0:69 Connecting to ct.mirror.garr.it|90.147.164.69|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 651916 (637K) [text/plain] Saving to: '/usr/ports/srcfiles/kmenuedit-5.12.4.tar.xz.partial' kmenuedit-5.12.4.tar.x 100%[===========================>] 636.64K 432KB/s in 1.5s 2018-04-09 08:00:58 (432 KB/s) - '/usr/ports/srcfiles/kmenuedit-5.12.4.tar.xz.partial' saved [651916/651916] =======> Building '/usr/ports/packages/kmenuedit#5.12.4-1.pkg.tar.gz'. bsdtar -p -o -C /usr/ports/work/kmenuedit/src -xf /usr/ports/srcfiles/kmenuedit-5.12.4.tar.xz + build + cd kmenuedit-5.12.4 + cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONF_INSTALL_DIR=/usr/etc -DLIB_INSTALL_DIR=/usr/lib -DBUILD_TESTING=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev + make make: *** No targets specified and no makefile found. Stop. =======> ERROR: Building '/usr/ports/packages/kmenuedit#5.12.4-1.pkg.tar.gz' failed. -- Packages where update failed kmenuedit ****************** The package is present in /usr/ports/srcfiles as: kmenuedit-5.12.4.tar.xz. The same thing applies to the other packages. What is the problem, and what should I do? Many thanks for a kind answer. Giorgio Cittadini

3 3

ports/compat-32 (3.4): [notify] gnutls-32: 3.5.14 -> 3.5.18 new dependencies libtasn1-32 p11-kit-32
by crux＠crux.nu 04 Apr '18

04 Apr '18

commit 3c77ffd85562b8e2a14fd3c623547d55b9a2b688 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Apr 4 20:25:04 2018 +1000 [notify] gnutls-32: 3.5.14 -> 3.5.18 new dependencies libtasn1-32 p11-kit-32 diff --git a/gnutls-32/.footprint b/gnutls-32/.footprint index 0b80892..a5264be 100644 --- a/gnutls-32/.footprint +++ b/gnutls-32/.footprint @@ -1,9 +1,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rwxr-xr-x root/root usr/lib32/libgnutls.la -lrwxrwxrwx root/root usr/lib32/libgnutls.so -> libgnutls.so.30.14.6 -lrwxrwxrwx root/root usr/lib32/libgnutls.so.30 -> libgnutls.so.30.14.6 --rwxr-xr-x root/root usr/lib32/libgnutls.so.30.14.6 +lrwxrwxrwx root/root usr/lib32/libgnutls.so -> libgnutls.so.30.14.10 +lrwxrwxrwx root/root usr/lib32/libgnutls.so.30 -> libgnutls.so.30.14.10 +-rwxr-xr-x root/root usr/lib32/libgnutls.so.30.14.10 -rwxr-xr-x root/root usr/lib32/libgnutlsxx.la lrwxrwxrwx root/root usr/lib32/libgnutlsxx.so -> libgnutlsxx.so.28.1.0 lrwxrwxrwx root/root usr/lib32/libgnutlsxx.so.28 -> libgnutlsxx.so.28.1.0 diff --git a/gnutls-32/.md5sum b/gnutls-32/.md5sum index 8e0518e..4db23be 100644 --- a/gnutls-32/.md5sum +++ b/gnutls-32/.md5sum @@ -1 +1 @@ -1e84b57a472b5f3b01f2c1b7a3a2bcbe gnutls-3.5.14.tar.xz +c2d93d305ecbc55939bc2a8ed4a76a3d gnutls-3.5.18.tar.xz diff --git a/gnutls-32/.signature b/gnutls-32/.signature index abef8d2..6bd09bb 100644 --- a/gnutls-32/.signature +++ b/gnutls-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXcD28FR8YaYssVG/bUSYX4gcnOGGEurzTg8cT776PH9Ggg4u3rVtnav7kZAsjzSKKwJbG55WSPBdg75XznjkswE= -SHA256 (Pkgfile) = 65fc3ab09fe2290b6bc763a2fc234e699565c55975fa11b368a75518836cd250 -SHA256 (.footprint) = ac7bbe50be8ba2e989dd064cf8248cb357cea23dc4957ad764038d8a44bbf34c -SHA256 (gnutls-3.5.14.tar.xz) = 4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda +RWSwxGo/zH7eXc2+lqBir2P5f8ZK7xP5URMxmh3cHKa/c9BFkgvb8z3GAObTYFwIKH+KpYjc6Ip3YV4HDrLO2dPOVqnby4R1Jg4= +SHA256 (Pkgfile) = 02c89689955539db782389977e8509ffb374c65facb712afbc740d8622f09784 +SHA256 (.footprint) = 4f209cef0dc20c9aed2895e1dbf40c914d3d7c1ff8c23e3cdff207035d976722 +SHA256 (gnutls-3.5.18.tar.xz) = ae2248d9e78747cf9c469dde81ff8f90b56838b707a0637f3f7d4eee90e80234 diff --git a/gnutls-32/Pkgfile b/gnutls-32/Pkgfile index 7647808..50b2503 100644 --- a/gnutls-32/Pkgfile +++ b/gnutls-32/Pkgfile @@ -1,10 +1,10 @@ # Description: A library that provides a secure layer over a reliable transport layer # URL: http://gnutls.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: nettle-32 libidn-32 gnutls +# Depends on: nettle-32 libidn-32 libtasn1-32 p11-kit-32 gnutls name=gnutls-32 -version=3.5.14 +version=3.5.18 release=1 source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/v${version%.*}/${name%-… @@ -15,11 +15,12 @@ build() { --prefix=/usr \ --libdir=/usr/lib32 \ --host=i686-pc-linux-gnu \ - --without-p11-kit \ - --with-included-libtasn1 \ + --with-default-trust-store-pkcs11="pkcs11:" \ --with-included-unistring \ - --disable-guile + --disable-guile \ + --without-tpm + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make make DESTDIR=$PKG install

1 0