From 33ba297f1c0e246b712c5987922bf9d741ca85f8 Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Fri, 31 Jul 2020 16:48:26 +0100 Subject: [PATCH] Allow unregisterised ghc-8.6 to build newer GHC MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit af9b744bbf1 introduced a regression stopping existing unregisterised compilers from being able to compile newer versions of GHC. The problem is that the bootstrap compiler uses the newer `includes/stg/MiscClosures.h` file where some defines have been renamed, resulting in the following error: . error: ‘stg_atomicModifyMutVarzh’ undeclared (first use in this function); did you mean ‘stg_atomicModifyMutVar2zh’? . For more information, see https://gitlab.haskell.org/ghc/ghc/issues/17111. . This patch can be removed, once ghc-8.6 is no longer the bootstrap compiler. Author: Ilias Tsitsimpis Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111 Gbp-Pq: Name fix-build-using-unregisterised-v8.6 --- includes/stg/MiscClosures.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index 8c4cb9fc..b4bdffe4 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -390,8 +390,12 @@ RTS_FUN_DECL(stg_copySmallMutableArrayzh); RTS_FUN_DECL(stg_casSmallArrayzh); RTS_FUN_DECL(stg_newMutVarzh); +#if __GLASGOW_HASKELL__ < 808 +RTS_FUN_DECL(stg_atomicModifyMutVarzh); +#else RTS_FUN_DECL(stg_atomicModifyMutVar2zh); RTS_FUN_DECL(stg_atomicModifyMutVarzuzh); +#endif RTS_FUN_DECL(stg_casMutVarzh); RTS_FUN_DECL(stg_isEmptyMVarzh); -- 2.30.2