January 2017 - crux-commits

ports/opt (3.2): wine: 2.0-rc4 -> 2.0-rc6
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 91314f8a2a4ad033e3c2a659a1aabff771c5c042 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:27:39 2017 +1100 wine: 2.0-rc4 -> 2.0-rc6 diff --git a/wine/.md5sum b/wine/.md5sum index 281f113..299a925 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,5 +1,4 @@ -e8569b4cf0fa21afb5304cff71296c0e wine-2.0-rc4.tar.bz2 +80dc66cb5769537e71aeb24310e14c36 wine-2.0-rc6.tar.bz2 b0760cf51527b70435c3e4d0361a129a wine-mono-4.6.4.msi 5ebc4ec71c92b3db3d84b334a1db385d wine_gecko-2.47-x86.msi d93ac0d2e6aceafe9113a9918916df45 wine_gecko-2.47-x86_64.msi -c14769c348a31678f30965f38e5e5a95 winhlp32-macro-flex-2.6.3-flex.patch diff --git a/wine/Pkgfile b/wine/Pkgfile index d02e673..18b198e 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,23 +5,18 @@ # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 xorg-libxxf86vm-32 name=wine -version=2.0-rc4 +version=2.0-rc6 release=1 source=(http://dl.winehq.org/wine/source/2.0/$name-$version.tar.bz2 http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi - http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi - winhlp32-macro-flex-2.6.3-flex.patch) + http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi) build() { install -d wine32 wine64 export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - # undefined reference yywrap in winhlp32/macro.lex.yy.c - # when building with flex-2.6.3 - patch -d $name-$version -p1 -i $SRC/winhlp32-macro-flex-2.6.3-flex.patch - cd wine64 ../$name-$version/configure \ diff --git a/wine/winhlp32-macro-flex-2.6.3-flex.patch b/wine/winhlp32-macro-flex-2.6.3-flex.patch deleted file mode 100644 index 4d41ed2..0000000 --- a/wine/winhlp32-macro-flex-2.6.3-flex.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.winehq.org/show_bug.cgi?id=42132 -Bug 42132 - undefined reference yywrap in winhlp32/macro.lex.yy.c when building with flex-2.6.3 - -$ git diff -diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l -index 8f6945ca98..ff8a4832d3 100644 ---- a/programs/winhlp32/macro.lex.l -+++ b/programs/winhlp32/macro.lex.l -@@ -20,7 +20,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - %} --%option noinput nounput never-interactive 8bit -+%option noinput nounput noyywrap never-interactive 8bit - %x quote - %{ - #include "config.h" -@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) - { - return lex_data ? lex_data->window : Globals.active_win; - } -- --#ifndef yywrap --int yywrap(void) { return 1; } --#endif

1 0

ports/compat-32 (3.2): zlib-32: 1.2.10 -> 1.2.11
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit d7c0d94139c7d9b758d367824a4196736f1dc254 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:52:49 2017 +1100 zlib-32: 1.2.10 -> 1.2.11 diff --git a/zlib-32/.footprint b/zlib-32/.footprint index ed9663e..b4d1859 100644 --- a/zlib-32/.footprint +++ b/zlib-32/.footprint @@ -1,9 +1,9 @@ drwxr-xr-x root/root lib32/ -lrwxrwxrwx root/root lib32/libz.so.1 -> libz.so.1.2.10 --rwxr-xr-x root/root lib32/libz.so.1.2.10 +lrwxrwxrwx root/root lib32/libz.so.1 -> libz.so.1.2.11 +-rwxr-xr-x root/root lib32/libz.so.1.2.11 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libz.a -lrwxrwxrwx root/root usr/lib32/libz.so -> ../../lib32/libz.so.1.2.10 +lrwxrwxrwx root/root usr/lib32/libz.so -> ../../lib32/libz.so.1.2.11 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/zlib.pc diff --git a/zlib-32/.md5sum b/zlib-32/.md5sum index 364928b..d35f7a1 100644 --- a/zlib-32/.md5sum +++ b/zlib-32/.md5sum @@ -1 +1 @@ -d9794246f853d15ce0fcbf79b9a3cf13 zlib-1.2.10.tar.gz +1c9f62f0778697a09d36121ead88e08e zlib-1.2.11.tar.gz diff --git a/zlib-32/Pkgfile b/zlib-32/Pkgfile index b4ee6c5..fdd82bc 100644 --- a/zlib-32/Pkgfile +++ b/zlib-32/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu name=zlib-32 -version=1.2.10 +version=1.2.11 release=1 source=(http://www.zlib.net/zlib-$version.tar.gz)

1 0

ports/compat-32 (3.2): xorg-libxi-32: 1.7.8 -> 1.7.9
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit f8bff0638c8bff258a048d4b8d8cf6e3de26f50e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:52:08 2017 +1100 xorg-libxi-32: 1.7.8 -> 1.7.9 diff --git a/xorg-libxi-32/.md5sum b/xorg-libxi-32/.md5sum index 4cd075a..af615fa 100644 --- a/xorg-libxi-32/.md5sum +++ b/xorg-libxi-32/.md5sum @@ -1 +1 @@ -94afc83e553d3c38a153f8f60301fd62 libXi-1.7.8.tar.bz2 +1f0f2719c020655a60aee334ddd26d67 libXi-1.7.9.tar.bz2 diff --git a/xorg-libxi-32/Pkgfile b/xorg-libxi-32/Pkgfile index 73e01e4..f368e7e 100644 --- a/xorg-libxi-32/Pkgfile +++ b/xorg-libxi-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-xproto-32 xorg-libx11-32 xorg-xextproto-32 xorg-libxext-32 xorg-inputproto xorg-libxi xorg-libxfixes-32 name=xorg-libxi-32 -version=1.7.8 +version=1.7.9 release=1 source=(http://xorg.freedesktop.org/releases/individual/lib/libXi-$version.…

1 0

ports/compat-32 (3.2): util-linux-32: 2.29 -> 2.29.1
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 846721bfc369ddbc366aa52c6ab6331d7409b67f Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:50:08 2017 +1100 util-linux-32: 2.29 -> 2.29.1 diff --git a/util-linux-32/.md5sum b/util-linux-32/.md5sum index 6ff3f41..bcb7e72 100644 --- a/util-linux-32/.md5sum +++ b/util-linux-32/.md5sum @@ -1 +1 @@ -07b6845f48a421ad5844aa9d58edb837 util-linux-2.29.tar.xz +0cbb6d16ab9c5736e5649ef1264bee6e util-linux-2.29.1.tar.xz diff --git a/util-linux-32/Pkgfile b/util-linux-32/Pkgfile index 1054090..b62631f 100644 --- a/util-linux-32/Pkgfile +++ b/util-linux-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: eudev-32 readline-32 zlib-32 name=util-linux-32 -version=2.29 +version=2.29.1 release=1 source=(https://www.kernel.org/pub/linux/utils/util-linux/v${version:0:4}/u…

1 0

ports/compat-32 (3.2): sqlite3-32: 3.15.2 -> 3.16.2
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 8d5dd0a827d78741cd722c20988e022da937d48a Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:48:58 2017 +1100 sqlite3-32: 3.15.2 -> 3.16.2 diff --git a/sqlite3-32/.md5sum b/sqlite3-32/.md5sum index c70c12a..ce58fad 100644 --- a/sqlite3-32/.md5sum +++ b/sqlite3-32/.md5sum @@ -1 +1 @@ -6b4fc0d8f7f02dd56bbde10a7c497a05 sqlite-autoconf-3150200.tar.gz +5a153ef1fd2fa5845ada74deabc68e32 sqlite-autoconf-3160200.tar.gz diff --git a/sqlite3-32/Pkgfile b/sqlite3-32/Pkgfile index ead4afa..ed46762 100644 --- a/sqlite3-32/Pkgfile +++ b/sqlite3-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses-32 readline-32 sqlite3 name=sqlite3-32 -version=3.15.2 +version=3.16.2 release=1 _version=$(printf "%i%.2i%.2i%.2i" ${version//./ })

1 0

ports/compat-32 (3.2): nss-32: 3.27.2 -> 3.28.1
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 54ab64ce385a5f8b0740e1c6fddab7a26a3fd1c7 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:45:11 2017 +1100 nss-32: 3.27.2 -> 3.28.1 diff --git a/nss-32/.md5sum b/nss-32/.md5sum index 0cf0f11..ad989d1 100644 --- a/nss-32/.md5sum +++ b/nss-32/.md5sum @@ -1,3 +1,3 @@ -ed089d28a3c593f8ba4ac26ad9984a75 nss-3.27.2.tar.gz +e98d48435cee5792f97ef7fc35a602c3 nss-3.28.1.tar.gz 17226659298a9d9bb3f323186d220f6f nss-config.in a796e6ab6c87573ffb649ce8769bc07a nss.pc.in diff --git a/nss-32/Pkgfile b/nss-32/Pkgfile index d794ace..755caaa 100644 --- a/nss-32/Pkgfile +++ b/nss-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: nss nspr-32 sqlite3-32 zlib-32 name=nss-32 -version=3.27.2 +version=3.28.1 release=1 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./_… nss-config.in nss.pc.in)

1 0

ports/compat-32 (3.2): libgpg-error-32: 1.25 -> 1.26
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit e25178e634be067c5d4f5a09a941f020986dc6aa Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:44:06 2017 +1100 libgpg-error-32: 1.25 -> 1.26 diff --git a/libgpg-error-32/.footprint b/libgpg-error-32/.footprint index a9cf3ef..ea78ba6 100644 --- a/libgpg-error-32/.footprint +++ b/libgpg-error-32/.footprint @@ -2,6 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgpg-error.a -rwxr-xr-x root/root usr/lib32/libgpg-error.la -lrwxrwxrwx root/root usr/lib32/libgpg-error.so -> libgpg-error.so.0.20.0 -lrwxrwxrwx root/root usr/lib32/libgpg-error.so.0 -> libgpg-error.so.0.20.0 --rwxr-xr-x root/root usr/lib32/libgpg-error.so.0.20.0 +lrwxrwxrwx root/root usr/lib32/libgpg-error.so -> libgpg-error.so.0.21.0 +lrwxrwxrwx root/root usr/lib32/libgpg-error.so.0 -> libgpg-error.so.0.21.0 +-rwxr-xr-x root/root usr/lib32/libgpg-error.so.0.21.0 diff --git a/libgpg-error-32/.md5sum b/libgpg-error-32/.md5sum index 15dc4f4..8017d83 100644 --- a/libgpg-error-32/.md5sum +++ b/libgpg-error-32/.md5sum @@ -1 +1 @@ -d9fa545922a5060cbfbd87464bc31686 libgpg-error-1.25.tar.bz2 +97456709dbbcbb69354317ffe3e347cd libgpg-error-1.26.tar.bz2 diff --git a/libgpg-error-32/Pkgfile b/libgpg-error-32/Pkgfile index 24a34c9..4f80549 100644 --- a/libgpg-error-32/Pkgfile +++ b/libgpg-error-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libgpg-error name=libgpg-error-32 -version=1.25 +version=1.26 release=1 source=(https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$version…

1 0

ports/compat-32 (3.2): libgcrypt-32: 1.7.3 -> 1.7.5
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 479767652caf344ef3b0a05246016fa9fbe7137b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:43:28 2017 +1100 libgcrypt-32: 1.7.3 -> 1.7.5 diff --git a/libgcrypt-32/.footprint b/libgcrypt-32/.footprint index 9df1dec..0e2c106 100644 --- a/libgcrypt-32/.footprint +++ b/libgcrypt-32/.footprint @@ -2,6 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgcrypt.a -rwxr-xr-x root/root usr/lib32/libgcrypt.la -lrwxrwxrwx root/root usr/lib32/libgcrypt.so -> libgcrypt.so.20.1.3 -lrwxrwxrwx root/root usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.1.3 --rwxr-xr-x root/root usr/lib32/libgcrypt.so.20.1.3 +lrwxrwxrwx root/root usr/lib32/libgcrypt.so -> libgcrypt.so.20.1.5 +lrwxrwxrwx root/root usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.1.5 +-rwxr-xr-x root/root usr/lib32/libgcrypt.so.20.1.5 diff --git a/libgcrypt-32/.md5sum b/libgcrypt-32/.md5sum index 7dedc95..a93a9e7 100644 --- a/libgcrypt-32/.md5sum +++ b/libgcrypt-32/.md5sum @@ -1 +1 @@ -c869e542cc13a1c28d8055487bf7f5c4 libgcrypt-1.7.3.tar.bz2 +74c8b4b2118946dcbfec5ff1cbf97177 libgcrypt-1.7.5.tar.bz2 diff --git a/libgcrypt-32/Pkgfile b/libgcrypt-32/Pkgfile index d346d90..1294e49 100644 --- a/libgcrypt-32/Pkgfile +++ b/libgcrypt-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libgcrypt libgpg-error-32 name=libgcrypt-32 -version=1.7.3 +version=1.7.5 release=1 source=(ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$version.tar.bz2)

1 0

ports/compat-32 (3.2): eudev-32: 3.2 -> 3.2.1
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 3275001fbdbc73197d60865c3e5088a9271fbb3f Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:42:28 2017 +1100 eudev-32: 3.2 -> 3.2.1 diff --git a/eudev-32/.md5sum b/eudev-32/.md5sum index 4ee629f..2364e84 100644 --- a/eudev-32/.md5sum +++ b/eudev-32/.md5sum @@ -1 +1 @@ -7e42d9b9ed8162021665139520676367 eudev-3.2.tar.gz +49f71f6c271ffa95b3c20d757d45c2e5 eudev-3.2.1.tar.gz diff --git a/eudev-32/Pkgfile b/eudev-32/Pkgfile index 0f0b2e5..e7665b5 100644 --- a/eudev-32/Pkgfile +++ b/eudev-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: kmod-32 eudev name=eudev-32 -version=3.2 +version=3.2.1 release=1 source=(http://dev.gentoo.org/~blueness/eudev/eudev-$version.tar.gz) @@ -14,8 +14,12 @@ build() { # needed for static linking, e.g. dmsetup.static sed -i '/^Libs:/s/-ludev/-ludev -lrt/' src/libudev/libudev.pc.in + # fix for gperf 3.1 + # https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a… + sed -i '/*keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c + autoreconf --force --install - + ./configure --prefix=/usr \ --libdir=/usr/lib32 \ --sbindir=/sbin --bindir=/sbin \

1 0

ports/compat-32 (3.2): llvm: 3.9.0 -> 3.9.1
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 934178bdc461596fad1e6758e8ab2f729303b527 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 12:53:53 2017 +1100 llvm: 3.9.0 -> 3.9.1 diff --git a/llvm-32/.footprint b/llvm-32/.footprint index 3c0ed2c..683db59 100644 --- a/llvm-32/.footprint +++ b/llvm-32/.footprint @@ -34,7 +34,7 @@ drwxr-xr-x root/root usr/lib32/cmake/llvm/ -rw-r--r-- root/root usr/lib32/cmake/llvm/LLVMProcessSources.cmake -rw-r--r-- root/root usr/lib32/cmake/llvm/TableGen.cmake -rw-r--r-- root/root usr/lib32/cmake/llvm/VersionFromVCS.cmake -lrwxrwxrwx root/root usr/lib32/libLLVM-3.9.0.so -> libLLVM-3.9.so +lrwxrwxrwx root/root usr/lib32/libLLVM-3.9.1.so -> libLLVM-3.9.so -rwxr-xr-x root/root usr/lib32/libLLVM-3.9.so lrwxrwxrwx root/root usr/lib32/libLLVM.so -> libLLVM-3.9.so -rw-r--r-- root/root usr/lib32/libLLVMAMDGPUAsmParser.a diff --git a/llvm-32/.md5sum b/llvm-32/.md5sum index 55668c3..86433d2 100644 --- a/llvm-32/.md5sum +++ b/llvm-32/.md5sum @@ -1 +1,2 @@ -f2093e98060532449eb7d2fcfd0bc6c6 llvm-3.9.0.src.tar.xz +7b8219e2b0d15e96a09dbe8bc2614777 0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch +3259018a7437e157f3642df80f1983ea llvm-3.9.1.src.tar.xz diff --git a/llvm-32/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch b/llvm-32/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch new file mode 100644 index 0000000..f9ec68c --- /dev/null +++ b/llvm-32/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch @@ -0,0 +1,120 @@ +From d6b5bd6f44e8091a4c4870f1c52921c25a4f8cca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny(a)gentoo.org> +Date: Sat, 21 Jan 2017 12:35:36 +0100 +Subject: [PATCH] Revert "AMDGPU: Fix an interaction between WQM and polygon + stippling" + +https://bugs.gentoo.org/603858 +--- + lib/Target/AMDGPU/SIInstructions.td | 1 - + lib/Target/AMDGPU/SIWholeQuadMode.cpp | 7 +++++ + test/CodeGen/AMDGPU/wqm.ll | 49 +++-------------------------------- + 3 files changed, 11 insertions(+), 46 deletions(-) + +diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td +index dde5f2fc6b4..18b7d5d62ef 100644 +--- a/lib/Target/AMDGPU/SIInstructions.td ++++ b/lib/Target/AMDGPU/SIInstructions.td +@@ -2029,7 +2029,6 @@ def SI_RETURN : PseudoInstSI < + let hasSideEffects = 1; + let SALU = 1; + let hasNoSchedulingInfo = 1; +- let DisableWQM = 1; + } + + let Uses = [EXEC], Defs = [EXEC, VCC, M0], +diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +index 1534d582569..b200c153df0 100644 +--- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp ++++ b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +@@ -219,6 +219,13 @@ char SIWholeQuadMode::scanInstructions(MachineFunction &MF, + markInstruction(MI, Flags, Worklist); + GlobalFlags |= Flags; + } ++ ++ if (WQMOutputs && MBB.succ_empty()) { ++ // This is a prolog shader. Make sure we go back to exact mode at the end. ++ Blocks[&MBB].OutNeeds = StateExact; ++ Worklist.push_back(&MBB); ++ GlobalFlags |= StateExact; ++ } + } + + return GlobalFlags; +diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll +index 41e42645788..809a7ba9b82 100644 +--- a/test/CodeGen/AMDGPU/wqm.ll ++++ b/test/CodeGen/AMDGPU/wqm.ll +@@ -17,18 +17,17 @@ main_body: + ;CHECK-LABEL: {{^}}test2: + ;CHECK-NEXT: ; %main_body + ;CHECK-NEXT: s_wqm_b64 exec, exec ++;CHECK: image_sample + ;CHECK-NOT: exec +-define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { ++;CHECK: _load_dword v0, ++define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { + main_body: + %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) + %c.2 = bitcast <4 x float> %c.1 to <4 x i32> + %c.3 = extractelement <4 x i32> %c.2, i32 0 + %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3 + %data = load float, float addrspace(1)* %gep +- +- call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef) +- +- ret void ++ ret float %data + } + + ; ... but disabled for stores (and, in this simple case, not re-enabled). +@@ -415,46 +414,6 @@ entry: + ret void + } + +-; Must return to exact at the end of a non-void returning shader, +-; otherwise the EXEC mask exported by the epilog will be wrong. This is true +-; even if the shader has no kills, because a kill could have happened in a +-; previous shader fragment. +-; +-; CHECK-LABEL: {{^}}test_nonvoid_return: +-; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec +-; CHECK: s_wqm_b64 exec, exec +-; +-; CHECK: s_and_b64 exec, exec, [[LIVE]] +-; CHECK-NOT: exec +-define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind { +- %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- %tex.i = bitcast <4 x float> %tex to <4 x i32> +- %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- ret <4 x float> %dtex +-} +- +-; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable: +-; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec +-; CHECK: s_wqm_b64 exec, exec +-; +-; CHECK: s_and_b64 exec, exec, [[LIVE]] +-; CHECK-NOT: exec +-define amdgpu_ps <4 x float> @test_nonvoid_return_unreachable(i32 inreg %c) nounwind { +-entry: +- %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- %tex.i = bitcast <4 x float> %tex to <4 x i32> +- %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- +- %cc = icmp sgt i32 %c, 0 +- br i1 %cc, label %if, label %else +- +-if: +- store volatile <4 x float> %dtex, <4 x float>* undef +- unreachable +- +-else: +- ret <4 x float> %dtex +-} + + declare void @llvm.amdgcn.image.store.v4i32(<4 x float>, <4 x i32>, <8 x i32>, i32, i1, i1, i1, i1) #1 + declare void @llvm.amdgcn.buffer.store.f32(float, <4 x i32>, i32, i32, i1, i1) #1 +-- +2.11.0 + diff --git a/llvm-32/Pkgfile b/llvm-32/Pkgfile index ef97694..29e7c88 100644 --- a/llvm-32/Pkgfile +++ b/llvm-32/Pkgfile @@ -5,13 +5,16 @@ # Depends on: python-32 llvm name=llvm-32 -version=3.9.0 -release=2 -source=(http://llvm.org/releases/$version/llvm-$version.src.tar.xz) +version=3.9.1 +release=1 +source=(http://llvm.org/releases/$version/llvm-$version.src.tar.xz + 0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch) build() { cd llvm-$version.src + patch -p1 -i $SRC/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch + install -d build $SRC/keep cd build

1 0