Fri Nov 6 20:13:49 2020 UTC ()
Apply fix from

  https://bugs.llvm.org/show_bug.cgi?id=46683
i.e.
  https://github.com/llvm/llvm-project/commit/a5d161c119d5a03c1ce834c6f4ce2576d6a064e4

so that we avoid emitting a 64-bit-only instructio in 32-bit PPC mode.

Bump PKGREVISION.


(he)
diff -r1.200 -r1.201 pkgsrc/lang/rust/Makefile
diff -r1.119 -r1.120 pkgsrc/lang/rust/distinfo
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCInstrInfo.td
cvs diff -r1.200 -r1.201 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/10/29 11:04:59 1.200
+++ pkgsrc/lang/rust/Makefile 2020/11/06 20:13:49 1.201
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.200 2020/10/29 11:04:59 ryoon Exp $ 1# $NetBSD: Makefile,v 1.201 2020/11/06 20:13:49 he Exp $
2 2
3DISTNAME= rustc-1.46.0-src 3DISTNAME= rustc-1.46.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= https://static.rust-lang.org/dist/ 7MASTER_SITES= https://static.rust-lang.org/dist/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.rust-lang.org/ 10HOMEPAGE= https://www.rust-lang.org/
10COMMENT= Safe, concurrent, practical language 11COMMENT= Safe, concurrent, practical language
11LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
12 13
13CONFLICTS+= rust-bin-[0-9]* 14CONFLICTS+= rust-bin-[0-9]*
14 15
15# uses -std=c++14 16# uses -std=c++14
16GCC_REQD+= 5 17GCC_REQD+= 5
17 18
cvs diff -r1.119 -r1.120 pkgsrc/lang/rust/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/rust/distinfo 2020/10/28 11:16:46 1.119
+++ pkgsrc/lang/rust/distinfo 2020/11/06 20:13:49 1.120
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.119 2020/10/28 11:16:46 he Exp $ 1$NetBSD: distinfo,v 1.120 2020/11/06 20:13:49 he Exp $
2 2
3SHA1 (rust-1.45.0-x86_64-sun-solaris.tar.gz) = f0c0ce644e0f72b240ecd797b22df271f6e24a5a 3SHA1 (rust-1.45.0-x86_64-sun-solaris.tar.gz) = f0c0ce644e0f72b240ecd797b22df271f6e24a5a
4RMD160 (rust-1.45.0-x86_64-sun-solaris.tar.gz) = ebf9813d4e4626cdfa5d4bdceb8e4912b0d12ed2 4RMD160 (rust-1.45.0-x86_64-sun-solaris.tar.gz) = ebf9813d4e4626cdfa5d4bdceb8e4912b0d12ed2
5SHA512 (rust-1.45.0-x86_64-sun-solaris.tar.gz) = 451b76f32d8e8d882ddc18f9722a17c5fba58348952c194e93efe6c093e7c3465ab34fcbb92f60edee979782409115d3f7b5ab9bcadbe61ed169fd381f0b777b 5SHA512 (rust-1.45.0-x86_64-sun-solaris.tar.gz) = 451b76f32d8e8d882ddc18f9722a17c5fba58348952c194e93efe6c093e7c3465ab34fcbb92f60edee979782409115d3f7b5ab9bcadbe61ed169fd381f0b777b
6Size (rust-1.45.0-x86_64-sun-solaris.tar.gz) = 150890381 bytes 6Size (rust-1.45.0-x86_64-sun-solaris.tar.gz) = 150890381 bytes
7SHA1 (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = bed778692ce1d9f35b1e4ca09a02e97a9195ab7e 7SHA1 (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = bed778692ce1d9f35b1e4ca09a02e97a9195ab7e
8RMD160 (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = b1a5a7d5922e6e6166fb6452d30ce83bbdf5fbc8 8RMD160 (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = b1a5a7d5922e6e6166fb6452d30ce83bbdf5fbc8
9SHA512 (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = 4def59250a963942179c1bfbccb3d15ee6bac09b8589dec18c6ebcbdd86bed8d71a2fa196a6fe3b78d5baae7571036ce37afdb5c5b1030f00ac107da292a44e3 9SHA512 (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = 4def59250a963942179c1bfbccb3d15ee6bac09b8589dec18c6ebcbdd86bed8d71a2fa196a6fe3b78d5baae7571036ce37afdb5c5b1030f00ac107da292a44e3
10Size (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = 165099975 bytes 10Size (rust-1.45.2-aarch64-unknown-netbsd.tar.gz) = 165099975 bytes
11SHA1 (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = 71b77c6f5eb75d02fb6c82b99deec2ce2adf9aa1 11SHA1 (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = 71b77c6f5eb75d02fb6c82b99deec2ce2adf9aa1
12RMD160 (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = ec1ce866ff4f7a694295036348717be7703b2617 12RMD160 (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = ec1ce866ff4f7a694295036348717be7703b2617
13SHA512 (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = 21de4e7fd680f1fd3040761f568875ae9578eb28a1a2a910130a6c5e08b66ee3ba707152c764459d7f8615d2265aeb982411ed6d4bc8819e549acf69f933736c 13SHA512 (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = 21de4e7fd680f1fd3040761f568875ae9578eb28a1a2a910130a6c5e08b66ee3ba707152c764459d7f8615d2265aeb982411ed6d4bc8819e549acf69f933736c
14Size (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = 159835409 bytes 14Size (rust-1.45.2-armv7-unknown-netbsd-eabihf.tar.gz) = 159835409 bytes
@@ -101,26 +101,27 @@ SHA1 (patch-src_bootstrap_builder.rs) =  @@ -101,26 +101,27 @@ SHA1 (patch-src_bootstrap_builder.rs) =
101SHA1 (patch-src_bootstrap_compile.rs) = 67d5ad13e13e6818535a319f55e990d511e7b83f 101SHA1 (patch-src_bootstrap_compile.rs) = 67d5ad13e13e6818535a319f55e990d511e7b83f
102SHA1 (patch-src_bootstrap_lib.rs) = 3277f2be69a269ac761a2a6ab4d5389d121e6ca6 102SHA1 (patch-src_bootstrap_lib.rs) = 3277f2be69a269ac761a2a6ab4d5389d121e6ca6
103SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0 103SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0
104SHA1 (patch-src_librustc__llvm_build.rs) = 7cc2aa0568aa2cbf4eb1fdbb00922b10df0b3ff6 104SHA1 (patch-src_librustc__llvm_build.rs) = 7cc2aa0568aa2cbf4eb1fdbb00922b10df0b3ff6
105SHA1 (patch-src_librustc__target_spec_solaris__base.rs) = 5ed283e5ead1ec60f0c9879fa3c8190248976dc7 105SHA1 (patch-src_librustc__target_spec_solaris__base.rs) = 5ed283e5ead1ec60f0c9879fa3c8190248976dc7
106SHA1 (patch-src_librustc__target_spec_x86__64__sun__solaris.rs) = f6ad33b41906bbf83a1cbd0e2fe13a4da37266fa 106SHA1 (patch-src_librustc__target_spec_x86__64__sun__solaris.rs) = f6ad33b41906bbf83a1cbd0e2fe13a4da37266fa
107SHA1 (patch-src_libstd_build.rs) = eb8faae53e997c14a40c0d35615f4ca5e316e7cc 107SHA1 (patch-src_libstd_build.rs) = eb8faae53e997c14a40c0d35615f4ca5e316e7cc
108SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a 108SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a
109SHA1 (patch-src_libunwind_build.rs) = 723ded63580812f74d04c447f90925725ae9bfc9 109SHA1 (patch-src_libunwind_build.rs) = 723ded63580812f74d04c447f90925725ae9bfc9
110SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427 110SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
111SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 199ae71ae2e42bb67e54354a051fc9faa71f9bfe 111SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 199ae71ae2e42bb67e54354a051fc9faa71f9bfe
112SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a 112SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a
113SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6 113SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6
 114SHA1 (patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCInstrInfo.td) = b2e8c29a279d511b51414241b3fe6a2f14c26502
114SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939 115SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939
115SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80 116SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80
116SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c 117SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c
117SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7 118SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7
118SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34 119SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34
119SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2 120SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2
120SHA1 (patch-vendor_backtrace-sys_src_libbacktrace_configure) = 90e54f66edce65ebe23fbf2480deb193ca926733 121SHA1 (patch-vendor_backtrace-sys_src_libbacktrace_configure) = 90e54f66edce65ebe23fbf2480deb193ca926733
121SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b 122SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b
122SHA1 (patch-vendor_libssh2-sys_libssh2_Makefile.am) = fc859243adffbe4e4202ed44792ecab09f347f31 123SHA1 (patch-vendor_libssh2-sys_libssh2_Makefile.am) = fc859243adffbe4e4202ed44792ecab09f347f31
123SHA1 (patch-vendor_lzma-sys_config.h) = ab963fc8d7a847715e0e0dc2928333efe38e923f 124SHA1 (patch-vendor_lzma-sys_config.h) = ab963fc8d7a847715e0e0dc2928333efe38e923f
124SHA1 (patch-vendor_rand-0.6.1_src_rngs_os.rs) = c068ae41fb69a524336efcef7df7a9d1326d04f1 125SHA1 (patch-vendor_rand-0.6.1_src_rngs_os.rs) = c068ae41fb69a524336efcef7df7a9d1326d04f1
125SHA1 (patch-vendor_rand__os_src_netbsd.rs) = 049df63c904abd81cb92f33fa0882f5c81cae51a 126SHA1 (patch-vendor_rand__os_src_netbsd.rs) = 049df63c904abd81cb92f33fa0882f5c81cae51a
126SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3 127SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3
File Added: pkgsrc/lang/rust/patches/Attic/patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCInstrInfo.td
$NetBSD: patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCInstrInfo.td,v 1.1 2020/11/06 20:13:49 he Exp $

Apply fix from
https://github.com/llvm/llvm-project/commit/a5d161c119d5a03c1ce834c6f4ce2576d6a064e4
so we avoid emitting a 64-bit-only instruction in 32-bit ppc code.

--- src/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.td.orig	2020-07-07 06:39:17.000000000 +0000
+++ src/llvm-project/llvm/lib/Target/PowerPC/PPCInstrInfo.td
@@ -5025,8 +5025,11 @@ def RotateInsertByte1 {
   dag Left = (RLWIMI RotateInsertByte3.Left, Swap4.Bits, 8, 24, 31);
 }
 
-def : Pat<(i32 (bitreverse i32:$A)),
-  (RLDICL_32 RotateInsertByte1.Left, 0, 32)>;
+// Clear the upper half of the register when in 64-bit mode
+let Predicates = [In64BitMode] in
+def : Pat<(i32 (bitreverse i32:$A)), (RLDICL_32 RotateInsertByte1.Left, 0, 32)>;
+let Predicates = [In32BitMode] in
+def : Pat<(i32 (bitreverse i32:$A)), RotateInsertByte1.Left>;
 
 // Fast 64-bit reverse bits algorithm:
 // Step 1: 1-bit swap (swap odd 1-bit and even 1-bit):