Thu Feb 17 11:59:24 2022 UTC ()
lang/ghc92/patches: Add a tech-kern thread URL


(pho)
diff -r1.4 -r1.5 pkgsrc/lang/ghc92/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ghc92/patches/patch-rts_Linker.c
cvs diff -r1.4 -r1.5 pkgsrc/lang/ghc92/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc92/distinfo 2022/02/17 10:18:51 1.4
+++ pkgsrc/lang/ghc92/distinfo 2022/02/17 11:59:24 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.4 2022/02/17 10:18:51 pho Exp $ 1$NetBSD: distinfo,v 1.5 2022/02/17 11:59:24 pho Exp $
2 2
3BLAKE2s (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 03efbb455a52d0dbc246b1c8b30f82121f5354a1ca0eb1b08b6225b90286a18f 3BLAKE2s (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 03efbb455a52d0dbc246b1c8b30f82121f5354a1ca0eb1b08b6225b90286a18f
4SHA512 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 730347bb5eaac4efac8ec487fafd2da6fe2932db45f59e324c83698eb0b0e8a6a4b4fd513de17fb9c152ccee328660cfe1638cad631ce5e35b2dbfddda0d8850 4SHA512 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 730347bb5eaac4efac8ec487fafd2da6fe2932db45f59e324c83698eb0b0e8a6a4b4fd513de17fb9c152ccee328660cfe1638cad631ce5e35b2dbfddda0d8850
5Size (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 49500236 bytes 5Size (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 49500236 bytes
6BLAKE2s (ghc-8.10.4-boot-x86_64-unknown-solaris2.tar.xz) = 6374752bf931ebb9908d989f78ae38c62342f8fe14e6357653e32652303b4c9d 6BLAKE2s (ghc-8.10.4-boot-x86_64-unknown-solaris2.tar.xz) = 6374752bf931ebb9908d989f78ae38c62342f8fe14e6357653e32652303b4c9d
7SHA512 (ghc-8.10.4-boot-x86_64-unknown-solaris2.tar.xz) = 3484e865b0b7c3fac4c56cdcee5e42e4579cea6a5fb527a894a9a8eba26a3bd0a691262dfb744c129f2be6bdc1d875756ffbba99fff49e1f19a10a567b4bdb12 7SHA512 (ghc-8.10.4-boot-x86_64-unknown-solaris2.tar.xz) = 3484e865b0b7c3fac4c56cdcee5e42e4579cea6a5fb527a894a9a8eba26a3bd0a691262dfb744c129f2be6bdc1d875756ffbba99fff49e1f19a10a567b4bdb12
8Size (ghc-8.10.4-boot-x86_64-unknown-solaris2.tar.xz) = 64361808 bytes 8Size (ghc-8.10.4-boot-x86_64-unknown-solaris2.tar.xz) = 64361808 bytes
9BLAKE2s (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 1dd13bbed8d4b873ccb1bed06706f41093ab616c6a63be8e59dfdfeab0af2b72 9BLAKE2s (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 1dd13bbed8d4b873ccb1bed06706f41093ab616c6a63be8e59dfdfeab0af2b72
10SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = f243d2a091dbaa670ecaac913266e428164064e5c73a2d4e96b603f16af94f3c4af4358e01c04d492de8ddd8c4b6d25ebe8b62b929b6191cd87f0f1d13873fde 10SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = f243d2a091dbaa670ecaac913266e428164064e5c73a2d4e96b603f16af94f3c4af4358e01c04d492de8ddd8c4b6d25ebe8b62b929b6191cd87f0f1d13873fde
11Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48912780 bytes 11Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48912780 bytes
12BLAKE2s (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 377b623a7fd13401376e07c6fe7e19db321bc9883156894af703d72524816f5f 12BLAKE2s (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 377b623a7fd13401376e07c6fe7e19db321bc9883156894af703d72524816f5f
13SHA512 (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 1c2d8e1df4d8545068c453e8437e29f1528015ce056150d98827709c026fc23f5460887467d20321b1d32e3fffefe7081c068d702881184029d1c63c0adb25e4 13SHA512 (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 1c2d8e1df4d8545068c453e8437e29f1528015ce056150d98827709c026fc23f5460887467d20321b1d32e3fffefe7081c068d702881184029d1c63c0adb25e4
14Size (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 57551160 bytes 14Size (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 57551160 bytes
@@ -36,22 +36,22 @@ SHA1 (patch-libraries_base_System_CPUTim @@ -36,22 +36,22 @@ SHA1 (patch-libraries_base_System_CPUTim
36SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215 36SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
37SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116 37SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
38SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721 38SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
39SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a 39SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a
40SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab 40SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
41SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a 41SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
42SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607 42SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
43SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b 43SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
44SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2 44SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2
45SHA1 (patch-llvm-targets) = cba672c60c9cb84e0347a3cd6e8770306542e5d8 45SHA1 (patch-llvm-targets) = cba672c60c9cb84e0347a3cd6e8770306542e5d8
46SHA1 (patch-m4_find__llvm__prog.m4) = cc56b21739aff5faec378a1c47f514613c18db9e 46SHA1 (patch-m4_find__llvm__prog.m4) = cc56b21739aff5faec378a1c47f514613c18db9e
47SHA1 (patch-m4_fptools__set__c__ld__flags.m4) = 2d37b779d662e66521d2b5fda994174c9dfcbc29 47SHA1 (patch-m4_fptools__set__c__ld__flags.m4) = 2d37b779d662e66521d2b5fda994174c9dfcbc29
48SHA1 (patch-mk_config.mk.in) = ae2134a50e571090d504549b2b3fed8bb953fceb 48SHA1 (patch-mk_config.mk.in) = ae2134a50e571090d504549b2b3fed8bb953fceb
49SHA1 (patch-rts_Linker.c) = aa04adb7d3275f4cf4e6b516a489beaed8642f21 49SHA1 (patch-rts_Linker.c) = c5aa2dbdaa42df2605672a054f35d1a37e2aef02
50SHA1 (patch-rts_ProfHeap.c) = fafbb740ee87949da12749834478769548322993 50SHA1 (patch-rts_ProfHeap.c) = fafbb740ee87949da12749834478769548322993
51SHA1 (patch-rts_ghc.mk) = 6e3daf71fb7e656131aa2aeeb0346c651520216a 51SHA1 (patch-rts_ghc.mk) = 6e3daf71fb7e656131aa2aeeb0346c651520216a
52SHA1 (patch-rts_posix_GetTime.c) = 036e09510c893ab8677a2b4add0193e7f811bb82 52SHA1 (patch-rts_posix_GetTime.c) = 036e09510c893ab8677a2b4add0193e7f811bb82
53SHA1 (patch-rts_posix_OSThreads.c) = 8f88fb2ae7caa910986aba9e1fba75ef564d0e15 53SHA1 (patch-rts_posix_OSThreads.c) = 8f88fb2ae7caa910986aba9e1fba75ef564d0e15
54SHA1 (patch-rules_build-package-way.mk) = ec73df0bbc85e962f76a9068683879a1a1ba1815 54SHA1 (patch-rules_build-package-way.mk) = ec73df0bbc85e962f76a9068683879a1a1ba1815
55SHA1 (patch-rules_distdir-way-opts.mk) = a058c6428faf02ef94aab3336d2d2874f2726f4e 55SHA1 (patch-rules_distdir-way-opts.mk) = a058c6428faf02ef94aab3336d2d2874f2726f4e
56SHA1 (patch-utils_ghc-cabal_ghc.mk) = c2d2a6ca42f30a05baf4125e3e01f0ba2989f773 56SHA1 (patch-utils_ghc-cabal_ghc.mk) = c2d2a6ca42f30a05baf4125e3e01f0ba2989f773
57SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067 57SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067
cvs diff -r1.1 -r1.2 pkgsrc/lang/ghc92/patches/patch-rts_Linker.c (expand / switch to unified diff)

--- pkgsrc/lang/ghc92/patches/patch-rts_Linker.c 2022/02/17 07:16:10 1.1
+++ pkgsrc/lang/ghc92/patches/patch-rts_Linker.c 2022/02/17 11:59:24 1.2
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1$NetBSD: patch-rts_Linker.c,v 1.1 2022/02/17 07:16:10 pho Exp $ 1$NetBSD: patch-rts_Linker.c,v 1.2 2022/02/17 11:59:24 pho Exp $
2 2
3NetBSD-specific way of switching pages from rw- to r-x. Should not be 3NetBSD-specific way of switching pages from rw- to r-x. Should not be
4upstreamed until we figure out why the hunk #0 is necessary. 4upstreamed until we figure out why the hunk #0 is necessary.
5 5
6Even when the RTS linker is not used, libraries/ghci/GHCi/InfoTable.hsc 6Even when the RTS linker is not used, libraries/ghci/GHCi/InfoTable.hsc
7(fillExecBuffer) calls rts/ExecPage.c (allocateExecPage) to store some 7(fillExecBuffer) calls rts/ExecPage.c (allocateExecPage) to store some
8executable code, which in turn calls mmapForLinker() and fails. 8executable code, which in turn calls mmapForLinker() and fails.
9 9
10Minimal test case: 10Minimal test case:
11https://gist.github.com/depressed-pho/a629247b48b3e6178e35a14c62e9d44f 11https://gist.github.com/depressed-pho/a629247b48b3e6178e35a14c62e9d44f
12 12
 13tech-kern thread:
 14https://mail-index.netbsd.org/tech-kern/2022/02/17/msg027969.html
 15
13This was previously not an issue, until 16This was previously not an issue, until
14https://gitlab.haskell.org/ghc/ghc/-/issues/20051 happened and lead to 17https://gitlab.haskell.org/ghc/ghc/-/issues/20051 happened and lead to
15https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 18https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155
16 19
17--- rts/Linker.c.orig 2021-10-28 20:41:34.000000000 +0000 20--- rts/Linker.c.orig 2021-10-28 20:41:34.000000000 +0000
18+++ rts/Linker.c 21+++ rts/Linker.c
19@@ -1115,9 +1115,17 @@ mmapForLinker (size_t bytes, uint32_t pr 22@@ -1115,9 +1115,17 @@ mmapForLinker (size_t bytes, uint32_t pr
20 mmap_again: 23 mmap_again:
21 #endif 24 #endif
22  25
23+#if defined(DYNAMIC) && defined(netbsd_HOST_OS) 26+#if defined(DYNAMIC) && defined(netbsd_HOST_OS)
24+ /* Dynamic RTS only uses this function for allocating some anonymous pages 27+ /* Dynamic RTS only uses this function for allocating some anonymous pages
25+ * for code generated on-the-fly, which doesn't need to be in a certain 28+ * for code generated on-the-fly, which doesn't need to be in a certain