lang/ghc: Remove unused patches and add some comments on bootstrap generation.

3 files changed, 2 insertions, 50 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 1e4f899a5fbc..974e002f10dc 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -95,11 +95,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libncursesw.so.8:misc/compat12x
 CONFIGURE_ARGS+=	--enable-dtrace=0
 .endif
 
-# .if ${ARCH} == i386
-# EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-libraries_ghc-prim_cbits_atomic.c \
-# 		${PATCHDIR}/extra-patch-rts_posix_TTY.c
-# .endif
-
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 BOOT_GHC_VERSION=      8.6.3
 .elif ${ARCH} == aarch64 || ${ARCH:Marmv*}
@@ -248,6 +243,7 @@ fixup-plist:
 	${BOOT_DIR}/bin/runhaskell ${PATCHDIR}/fixup-plist.hs ${.CURDIR}/pkg-plist
 
 # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
+# Set all OPTIONS to OFF when generating bootstraps
 .PHONY: create-bootstrap
 create-bootstrap:
 	cd ${WRKSRC} \
@@ -263,6 +259,7 @@ create-bootstrap:
 		&& ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
 
 # Much like create-bootstrap, just different naming and output format
+# Set DYNAMIC, GMP and PROFILE to ON, and DOCS to OFF when generating Stack bindist
 .PHONY: create-stack-bindist
 create-stack-bindist:
 	${REINPLACE_CMD} -e '/^mandir/d' \
diff --git a/lang/ghc/files/extra-patch-libraries_ghc-prim_cbits_atomic.c b/lang/ghc/files/extra-patch-libraries_ghc-prim_cbits_atomic.c
deleted file mode 100644
index b57de006e743..000000000000
--- a/lang/ghc/files/extra-patch-libraries_ghc-prim_cbits_atomic.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libraries/ghc-prim/cbits/atomic.c.orig	2019-11-23 20:27:35 UTC
-+++ libraries/ghc-prim/cbits/atomic.c
-@@ -365,7 +365,7 @@ extern StgWord64 hs_atomicread64(StgWord x);
- StgWord64
- hs_atomicread64(StgWord x)
- {
--#if HAVE_C11_ATOMICS
-+#if 0
-   return __atomic_load_n((StgWord64 *) x, __ATOMIC_SEQ_CST);
- #else
-   return __sync_add_and_fetch((StgWord64 *) x, 0);
-@@ -413,7 +413,7 @@ extern void hs_atomicwrite64(StgWord x, StgWord64 val)
- void
- hs_atomicwrite64(StgWord x, StgWord64 val)
- {
--#if HAVE_C11_ATOMICS
-+#if 0
-   __atomic_store_n((StgWord64 *) x, (StgWord64) val, __ATOMIC_SEQ_CST);
- #else
-   while (!__sync_bool_compare_and_swap((StgWord64 *) x, *(StgWord64 *) x, (StgWord64) val));
diff --git a/lang/ghc/files/extra-patch-rts_posix_TTY.c b/lang/ghc/files/extra-patch-rts_posix_TTY.c
deleted file mode 100644
index 4e32469fe054..000000000000
--- a/lang/ghc/files/extra-patch-rts_posix_TTY.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- rts/posix/TTY.c.orig	2019-11-02 14:49:16 UTC
-+++ rts/posix/TTY.c
-@@ -65,3 +65,22 @@ resetTerminalSettings (void)
-     }
- #endif
- }
-+
-+uint32_t __bswapsi2(uint32_t u) {
-+  return ((((u)&0xff000000) >> 24) |
-+          (((u)&0x00ff0000) >> 8)  |
-+          (((u)&0x0000ff00) << 8)  |
-+          (((u)&0x000000ff) << 24));
-+}
-+
-+uint64_t __bswapdi2(uint64_t u) {
-+  return (
-+      (((u)&0xff00000000000000ULL) >> 56) |
-+      (((u)&0x00ff000000000000ULL) >> 40) |
-+      (((u)&0x0000ff0000000000ULL) >> 24) |
-+      (((u)&0x000000ff00000000ULL) >> 8)  |
-+      (((u)&0x00000000ff000000ULL) << 8)  |
-+      (((u)&0x0000000000ff0000ULL) << 24) |
-+      (((u)&0x000000000000ff00ULL) << 40) |
-+      (((u)&0x00000000000000ffULL) << 56));
-+}