Index: head/lang/ghc/Makefile =================================================================== --- head/lang/ghc/Makefile (revision 506141) +++ head/lang/ghc/Makefile (revision 506142) @@ -1,325 +1,333 @@ # Created by: Simon Marlow # $FreeBSD$ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} PORTREVISION= 2 CATEGORIES= lang haskell MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ https://hackage.haskell.org/package/hscolour-${HSCOLOUR_VERSION}/:docs DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ hscolour-${HSCOLOUR_VERSION}.tar.gz:docs EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE # other supported arches are added based on GHC_VERSION below ONLY_FOR_ARCHS= amd64 i386 USES= autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz USE_LOCALE= en_US.UTF-8 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib CONFIGURE_ENV= CC=${CC} LD=${LD} PATH=${SLAVES_PREFIX}/bin:${PATH} MAKE_ENV= PATH=${SLAVES_PREFIX}/bin:${PATH} SUB_FILES= build.mk SUB_LIST= GHC_VERSION=${GHC_VERSION} \ NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \ CFLAGS="${CFLAGS}" OPTIONS_GROUP= BOOTSTRAP BOOTSTRAP_DESC= Bootsrap using installed ghc OPTIONS_GROUP_BOOTSTRAP=BOOT OPTIONS_DEFINE= DYNAMIC GMP PROFILE DOCS OPTIONS_SUB= yes OPTIONS_DEFAULT= DYNAMIC PROFILE GMP BOOT_DESC= Use installed GHC for bootstrapping DOCS_DESC= Install HTML documentation DYNAMIC_DESC= Add support for dynamic linking GMP_DESC= Use GNU Multi-precision Library for big integers support PROFILE_DESC= Add support for performance profiling DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx DOCS_SUB_LIST= WITH_DOCS="YES" DOCS_SUB_LIST_OFF= WITH_DOCS="NO" DYNAMIC_CONFIGURE_WITH= system-libffi \ ffi-includes=${LOCALBASE}/include \ ffi-libraries=${LOCALBASE}/lib # The version number is needed as lang/gcc installs a different version DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi DYNAMIC_SUB_LIST= WITH_DYNAMIC="YES" DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="NO" GMP_CONFIGURE_WITH= gmp-includes=${LOCALBASE}/include \ gmp-libraries=${LOCALBASE}/lib GMP_LIB_DEPENDS= libgmp.so:math/gmp GMP_SUB_LIST= INTEGER_LIBRARY="integer-gmp" GMP_SUB_LIST_OFF= INTEGER_LIBRARY="integer-simple" # Append substitutions for build.mk BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS} PROFILE_SUB_LIST= WITH_PROFILE="YES" PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO" GHC_VERSION?= ${GHC_VERSION_DEFAULT} GHC_VERSION_DEFAULT= 8.6.5 GHC_VERSION_MAJOR= ${GHC_VERSION:S/./ /g:[1]} GHC_VERSION_MINOR= ${GHC_VERSION:S/./ /g:[2]} HSCOLOUR_VERSION= 1.24.4 .if ${GHC_VERSION_MAJOR} >= 8 && ${GHC_VERSION_MINOR} >= 6 ONLY_FOR_ARCHS+= aarch64 armv6 armv7 powerpc64 .endif .include .if ${GHC_VERSION_MAJOR} == 8 && ${GHC_VERSION_MINOR} <= 4 LLVM_VERSION= 50 # Turn off for old GHCs, see PR 228727 CONFIGURE_ARGS+= --enable-dtrace=0 .else LLVM_VERSION= 60 .endif .if ${ARCH} == amd64 || ${ARCH} == i386 BOOT_GHC_VERSION= 8.4.3 .else BOOT_GHC_VERSION= 8.6.3 .endif # LLVM version that bootstrap compiler uses BOOT_LLVM_VERSION= 60 .if "${GHC_VERSION}" != "${GHC_VERSION_DEFAULT}" PATCHDIR= ${.CURDIR}/files${GHC_VERSION:S/.//g}/ .endif NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: Permission denied DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} GHC_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/} GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION} _EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \ ${GHC_LIBDIR}/bin/hpc \ ${GHC_LIBDIR}/bin/ghc-iserv \ ${GHC_LIBDIR}/bin/ghc-pkg \ ${GHC_LIBDIR}/bin/hsc2hs \ ${GHC_LIBDIR}/bin/runghc \ ${GHC_LIBDIR}/bin/ghc \ ${GHC_LIBDIR}/bin/hp2ps .if ${PORT_OPTIONS:MDOCS} _EXECUTABLES+= ${GHC_LIBDIR}/bin/haddock .endif .if ${PORT_OPTIONS:MPROFILE} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof .endif .if ${PORT_OPTIONS:MDYNAMIC} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn .endif .include .if empty(PORT_OPTIONS:MBOOT) - -DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot +. if ${ARCH} == powerpc64 && ${OSVERSION} < 1300036 +ELF_V= -elfv1 +. endif +DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${ELF_V}${EXTRACT_SUFX}:boot .endif # MBOOT .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 # CONFIGURE_TARGET must to be the same as the llvm triple CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aclocal.m4 BUILD_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} # When GHC being compiled and GHC used for bootstrapping support different # LLVM versions, we have to pull in both. Luckily, this is relatively rare. . if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION} BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} RUN_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} . endif .endif .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 USE_GCC= yes . if ${OSVERSION} < 1200086 IGNORE= lang/ghc requires at least FreeBSD 12.0-RELEASE . endif . ifdef QEMU_EMULATING IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware . endif .endif # Use binutils strip if we are using gcc, as it is faster that base one. See PR 234949 .if defined(USE_GCC) CONFIGURE_ENV+= STRIP=${LOCALBASE}/bin/strip .endif PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL} .if empty(PORT_OPTIONS:MBOOT) BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION} BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION} BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_ENV= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT SLAVE_ENV= # empty CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc .endif # MBOOT # override TMPDIR because /tmp often doesn't have enough space # to build some of the larger libraries. #TMPDIR= ${WRKSRC}/tmp SLAVES_PREFIX= ${WRKDIR}/slaves_prefix SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix post-extract: # Use the "wrap" trick on arches that have to use pre-ino64 bootstrap binaries .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \ (${ARCH} == amd64 || ${ARCH} == i386) @${REINPLACE_CMD} -e 's|@SettingsCCompilerLinkFlags@|& -Wl,--wrap=readdir_r,--wrap=stat,--wrap=lstat,--wrap=fstat,--wrap=mknod|' ${BOOT_DIR}/settings.in .endif # %%PORTDOCS%%%%DOCSDIR%%/html/libraries/doc-index-V.html post-install-script: ${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E \ -e 's,^${STAGEDIR}${PREFIX}/?,,' \ -e '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/s|^|@comment |g' \ >> ${TMPPLIST} ${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E \ -e 's,^${STAGEDIR}${PREFIX}/?,,' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/s|^|@comment |g' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/s|^|@comment|g' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/s|^|@comment |g' \ >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} # Cleanup the indexen created by gen_contents_index ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST} ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST} ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST} .endif ${ECHO} '@postunexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST} post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \ s|%%AR%%|${AR}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs # we must use binutils:ld on arm .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 @${REINPLACE_CMD} -e 's|LD_NO_GOLD=ld|LD_NO_GOLD=${LOCALBASE}/bin/ld|' \ ${WRKSRC}/aclocal.m4 .endif @${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in @${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in .if empty(PORT_OPTIONS:MBOOT) @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk +.endif + +# XXX osversion powerpc64 elfv2 +.if ${OSVERSION} >= 1300036 + @${REINPLACE_CMD} -e 's/ELF_V1/ELF_V2/' \ + ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 .endif pre-configure: apply-slist # Copy the subbed build.mk to the proper position ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk # Use the "wrap" trick on arches that have to use pre-ino64 bootstrap binaries .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \ ${OSVERSION} >= 1200031 && \ (${ARCH} == amd64 || ${ARCH} == i386) ${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \ ${AR} q $$x ${BOOT_DIR}/wrap.o; ${RANLIB} $$x; \ done ${RM} ${BOOT_DIR}/wrap.o .endif # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR} .if empty(PORT_OPTIONS:MBOOT) cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR} cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install .endif # If DOCS are set, install HsColour in-place .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${SLAVES_PREFIX} ${MKDIR} ${SLAVES_WRKDIRPREFIX} cd ${SLAVES_WRKDIRPREFIX} && \ ${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \ cd hscolour-${HSCOLOUR_VERSION} && \ ${SLAVE_ENV} ghc --make -o Setup Setup.hs -package Cabal && \ ${SLAVE_ENV} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} --with-gcc=${CC} --with-ld=${LD} && \ ${SLAVE_ENV} ./Setup build && \ ${SLAVE_ENV} ./Setup install .endif post-install: (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \ ${STRIP_CMD} $$f; done) .if ${PORT_OPTIONS:MDOCS} ${MV} ${STAGEDIR}${PREFIX}/bin/haddock ${STAGEDIR}${PREFIX}/bin/haddock-ghc-${GHC_VERSION} .endif # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail .PHONY: create-bootstrap create-bootstrap: cd ${WRKSRC} \ && ${ECHO} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \ && ${ECHO} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \ && ${GMAKE} binary-dist TAR_COMP=xz \ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz cd /tmp \ && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \ && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \ && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz # Much like create-bootstrap, just different naming and output format .PHONY: create-stack-bindist create-stack-bindist: ${REINPLACE_CMD} -e '/^mandir/d' \ -e '/^infodir/d' \ -e '/^docdir/d' \ -e '/^htmldir/d' \ ${WRKSRC}/mk/build.mk cd ${WRKSRC} \ && ${GMAKE} binary-dist TAR_COMP=xz \ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ cd /tmp \ && ${ECHO} "${GHC_VERSION}:" \ && ${ECHO} "url: \"http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz\"" \ && ${ECHO} -n "content-length: " \ && ${STAT} -f %z ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \ && ${ECHO} -n "sha1: " \ && sha1 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \ && ${ECHO} -n "sha256: " \ && sha256 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz .include Index: head/lang/ghc/distinfo =================================================================== --- head/lang/ghc/distinfo (revision 506141) +++ head/lang/ghc/distinfo (revision 506142) @@ -1,27 +1,29 @@ TIMESTAMP = 1559470463 SHA256 (ghc-8.6.5-src.tar.xz) = 4d4aa1e96f4001b934ac6193ab09af5d6172f41f5a5d39d8e43393b9aafee361 SIZE (ghc-8.6.5-src.tar.xz) = 19092168 SHA256 (ghc-8.6.4-src.tar.xz) = 5b5d07e4463203a433c3ed3df461ba6cce11b6d2b9b264db31f3429075d0303a SIZE (ghc-8.6.4-src.tar.xz) = 19029904 SHA256 (ghc-8.6.3-src.tar.xz) = 9f9e37b7971935d88ba80426c36af14b1e0b3ec1d9c860f44a4391771bc07f23 SIZE (ghc-8.6.3-src.tar.xz) = 19138116 SHA256 (ghc-8.6.2-src.tar.xz) = caaa819d21280ecde90a4773143dee188711e9ff175a27cfbaee56eb851d76d5 SIZE (ghc-8.6.2-src.tar.xz) = 19024236 SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2 SIZE (ghc-8.4.4-src.tar.xz) = 11319500 SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6 SIZE (ghc-8.4.3-src.tar.xz) = 11315068 SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592 SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7 SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584 SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68 SIZE (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 113748008 SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d01199ceb0dfa5c84de692cec427e67ae1cf1ba6e1fc20e7ca854c6ceb556 SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668 -SHA256 (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4 -SIZE (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = 112652192 +SHA256 (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = d05431053aeabe9a284439e1ebb4e0a58587cc14f9e5f6250b1b1e4476c4ec83 +SIZE (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = 107059040 +SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4 +SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = 112652192 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d SIZE (hscolour-1.24.4.tar.gz) = 28729 Index: head/lang/ghc/files/patch-ppc64 =================================================================== --- head/lang/ghc/files/patch-ppc64 (revision 506141) +++ head/lang/ghc/files/patch-ppc64 (revision 506142) @@ -1,411 +1,465 @@ --- libraries/containers/include/containers.h +++ libraries/containers/include/containers.h @@ -35,7 +35,6 @@ #ifdef __GLASGOW_HASKELL__ # define USE_ST_MONAD 1 -# define USE_UNBOXED_ARRAYS 1 #endif #endif -From cbdb2dcf8ff0702d0a52f8fc3ee0288c9dde0e92 Mon Sep 17 00:00:00 2001 -From: Peter Trommler -Date: Fri, 28 Dec 2018 22:30:34 +0100 -Subject: [PATCH] RTS: Use ELF v1 convention on all powerpc64 systems - ---- - rts/StgCRun.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/rts/StgCRun.c b/rts/StgCRun.c -index 92b0696c2b..4480198564 100644 ---- rts/StgCRun.c -+++ rts/StgCRun.c -@@ -749,7 +749,6 @@ StgRunIsImplementedInAssembler(void) - - #if defined(powerpc64_HOST_ARCH) - --#if defined(linux_HOST_OS) - static void GNUC3_ATTRIBUTE(used) - StgRunIsImplementedInAssembler(void) - { -@@ -871,10 +870,6 @@ StgRunIsImplementedInAssembler(void) - : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); - } - --#else // linux_HOST_OS --#error Only Linux support for power64 right now. --#endif -- - #endif - - #if defined(powerpc64le_HOST_ARCH) - - - - From f4399ce96514ab58d766de999896780e93c886c6 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:52:31 +0100 Subject: [PATCH] PPC NCG: Make calling convention more general All operating systems except AIX and Darwin follow the ELF specification. --- compiler/nativeGen/PPC/CodeGen.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index efd9591c71..56e3bc280b 100644 --- compiler/nativeGen/PPC/CodeGen.hs +++ compiler/nativeGen/PPC/CodeGen.hs @@ -1565,18 +1565,17 @@ genCCall target dest_regs argsAndHints = panic "genCall: Wrong number of arguments/results for fabs" -- TODO: replace 'Int' by an enum such as 'PPC_64ABI' -data GenCCallPlatform = GCPLinux | GCPDarwin | GCPLinux64ELF !Int | GCPAIX +data GenCCallPlatform = GCP32ELF | GCP64ELF !Int | GCPAIX | GCPDarwin platformToGCP :: Platform -> GenCCallPlatform platformToGCP platform = case platformOS platform of - OSLinux -> case platformArch platform of - ArchPPC -> GCPLinux - ArchPPC_64 ELF_V1 -> GCPLinux64ELF 1 - ArchPPC_64 ELF_V2 -> GCPLinux64ELF 2 - _ -> panic "PPC.CodeGen.platformToGCP: Unknown Linux" OSAIX -> GCPAIX OSDarwin -> GCPDarwin - _ -> panic "PPC.CodeGen.platformToGCP: not defined for this OS" + _ -> case platformArch platform of + ArchPPC -> GCP32ELF + ArchPPC_64 ELF_V1 -> GCP64ELF 1 + ArchPPC_64 ELF_V2 -> GCP64ELF 2 + _ -> panic "platformToGCP: Not PowerPC" genCCall' -- 2.19.2 From fa2128cb78a8b365d822c23b8da19fa14ac23ce3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:55:35 +0100 Subject: [PATCH] PPC NCG: Make `stackHeaderSize` more general --- compiler/nativeGen/PPC/Instr.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs index 8eb5e8fa8d..ce421ed4bf 100644 --- compiler/nativeGen/PPC/Instr.hs +++ compiler/nativeGen/PPC/Instr.hs @@ -573,15 +573,14 @@ ppc_mkLoadInstr dflags reg delta slot stackFrameHeaderSize :: DynFlags -> Int stackFrameHeaderSize dflags = case platformOS platform of - OSLinux -> case platformArch platform of - -- header + parameter save area - ArchPPC -> 64 -- TODO: check ABI spec - ArchPPC_64 ELF_V1 -> 48 + 8 * 8 - ArchPPC_64 ELF_V2 -> 32 + 8 * 8 - _ -> panic "PPC.stackFrameHeaderSize: Unknown Linux" OSAIX -> 24 + 8 * 4 OSDarwin -> 64 -- TODO: check ABI spec - _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" + _ -> case platformArch platform of + -- header + parameter save area + ArchPPC -> 64 -- TODO: check ABI spec + ArchPPC_64 ELF_V1 -> 48 + 8 * 8 + ArchPPC_64 ELF_V2 -> 32 + 8 * 8 + _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" where platform = targetPlatform dflags -- | The maximum number of bytes required to spill a register. PPC32 -- 2.19.2 From 3472824eee7c616aaf755c147ef2c3e4d79fbec4 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:12:48 +0100 Subject: [PATCH] PPC NCG: GOT declaration for all 64-bit ELF systems --- compiler/nativeGen/PIC.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs index 2f300c4614..7be7a860f7 100644 --- compiler/nativeGen/PIC.hs +++ compiler/nativeGen/PIC.hs @@ -527,19 +527,17 @@ pprGotDeclaration _ _ OSAIX ] --- PPC 64 ELF v1 needs a Table Of Contents (TOC) on Linux -pprGotDeclaration _ (ArchPPC_64 ELF_V1) OSLinux +-- PPC 64 ELF v1 needs a Table Of Contents (TOC) +pprGotDeclaration _ (ArchPPC_64 ELF_V1) _ = text ".section \".toc\",\"aw\"" -- In ELF v2 we also need to tell the assembler that we want ABI -- version 2. This would normally be done at the top of the file -- right after a file directive, but I could not figure out how -- to do that. -pprGotDeclaration _ (ArchPPC_64 ELF_V2) OSLinux +pprGotDeclaration _ (ArchPPC_64 ELF_V2) _ = vcat [ text ".abiversion 2", text ".section \".toc\",\"aw\"" ] -pprGotDeclaration _ (ArchPPC_64 _) _ - = panic "pprGotDeclaration: ArchPPC_64 only Linux supported" -- Emit GOT declaration -- Output whatever needs to be output once per .s file. -- 2.19.2 From 749e343ef07aeeb71fe38c432f1b88ad8a6d2a58 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:14:12 +0100 Subject: [PATCH] PPC NCG: Register definitions for all 64-bit systems --- compiler/nativeGen/PPC/Regs.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs index 227517be88..7a6d6ed8e5 100644 --- compiler/nativeGen/PPC/Regs.hs +++ compiler/nativeGen/PPC/Regs.hs @@ -229,12 +229,8 @@ allArgRegs = map regSingle [3..10] -- these are the regs which we cannot assume stay alive over a C call. callClobberedRegs :: Platform -> [Reg] -callClobberedRegs platform - = case platformOS platform of - OSAIX -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSDarwin -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSLinux -> map regSingle (0:[2..13] ++ map fReg [0..13]) - _ -> panic "PPC.Regs.callClobberedRegs: not defined for this architecture" +callClobberedRegs _platform + = map regSingle (0:[2..12] ++ map fReg [0..13]) allMachRegNos :: [RegNo] @@ -265,11 +261,10 @@ allFPArgRegs platform = case platformOS platform of OSAIX -> map (regSingle . fReg) [1..13] OSDarwin -> map (regSingle . fReg) [1..13] - OSLinux -> case platformArch platform of + _ -> case platformArch platform of ArchPPC -> map (regSingle . fReg) [1..8] ArchPPC_64 _ -> map (regSingle . fReg) [1..13] _ -> panic "PPC.Regs.allFPArgRegs: unknown PPC Linux" - _ -> panic "PPC.Regs.allFPArgRegs: not defined for this architecture" fits16Bits :: Integral a => a -> Bool fits16Bits x = x >= -32768 && x < 32768 -- 2.19.2 From 19731a77ed203870f76a53eaf01758efbb5144d3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sun, 13 Jan 2019 15:16:28 +0100 Subject: [PATCH] PPC NCG: Emit type declaration on all ELF systems --- compiler/nativeGen/PPC/Ppr.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs index 2f64d82ee5..82726d90d9 100644 --- compiler/nativeGen/PPC/Ppr.hs +++ compiler/nativeGen/PPC/Ppr.hs @@ -142,9 +142,8 @@ pprGloblDecl lbl pprTypeAndSizeDecl :: CLabel -> SDoc pprTypeAndSizeDecl lbl = sdocWithPlatform $ \platform -> - if platformOS platform == OSLinux && externallyVisibleCLabel lbl - then text ".type " <> - ppr lbl <> text ", @object" + if osElfTarget (platformOS platform) && externallyVisibleCLabel lbl + then text "\t.type " <> ppr lbl <> text ", @object" else empty pprLabel :: CLabel -> SDoc -- 2.19.2 --- compiler/nativeGen/PPC/CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +++ compiler/nativeGen/PPC/CodeGen.hs 2019-01-17 10:03:25.018164000 +0100 @@ -1047,7 +1047,7 @@ genJump tree genJump' :: CmmExpr -> GenCCallPlatform -> NatM InstrBlock -genJump' tree (GCPLinux64ELF 1) +genJump' tree (GCP64ELF 1) = do (target,code) <- getSomeReg tree return (code @@ -1057,7 +1057,7 @@ genJump' tree (GCPLinux64ELF 1) `snocOL` LD II64 r11 (AddrRegImm target (ImmInt 16)) `snocOL` BCTR [] Nothing) -genJump' tree (GCPLinux64ELF 2) +genJump' tree (GCP64ELF 2) = do (target,code) <- getSomeReg tree return (code @@ -1667,7 +1667,7 @@ genCCall' dflags gcp target dest_regs args Right dyn -> do -- implement call through function pointer (dynReg, dynCode) <- getSomeReg dyn case gcp of - GCPLinux64ELF 1 -> return ( dynCode + GCP64ELF 1 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 40)) `snocOL` LD II64 r11 (AddrRegImm dynReg (ImmInt 0)) @@ -1677,7 +1677,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` BCTRL usedRegs `snocOL` LD spFormat toc (AddrRegImm sp (ImmInt 40)) `appOL` codeAfter) - GCPLinux64ELF 2 -> return ( dynCode + GCP64ELF 2 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 24)) `snocOL` MR r12 dynReg @@ -1715,9 +1715,9 @@ genCCall' dflags gcp target dest_regs args initialStackOffset = case gcp of GCPAIX -> 24 GCPDarwin -> 24 - GCPLinux -> 8 - GCPLinux64ELF 1 -> 48 - GCPLinux64ELF 2 -> 32 + GCP32ELF -> 8 + GCP64ELF 1 -> 48 + GCP64ELF 2 -> 32 _ -> panic "genCall': unknown calling convention" -- size of linkage area + size of arguments, in bytes stackDelta finalStack = case gcp of @@ -1727,12 +1727,12 @@ genCCall' dflags gcp target dest_regs args GCPDarwin -> roundTo 16 $ (24 +) $ max 32 $ sum $ map (widthInBytes . typeWidth) argReps - GCPLinux -> roundTo 16 finalStack - GCPLinux64ELF 1 -> + GCP32ELF -> roundTo 16 finalStack + GCP64ELF 1 -> roundTo 16 $ (48 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps - GCPLinux64ELF 2 -> + GCP64ELF 2 -> roundTo 16 $ (32 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps @@ -1765,13 +1765,14 @@ genCCall' dflags gcp target dest_regs args -- link editor replaces the NOP instruction with a load of the TOC -- from the stack to restore the TOC. maybeNOP = case gcp of + GCP32ELF -> nilOL -- See Section 3.9.4 of OpenPower ABI GCPAIX -> unitOL NOP -- See Section 3.5.11 of PPC64 ELF v1.9 - GCPLinux64ELF 1 -> unitOL NOP + GCP64ELF 1 -> unitOL NOP -- See Section 2.3.6 of PPC64 ELF v2 - GCPLinux64ELF 2 -> unitOL NOP - _ -> nilOL + GCP64ELF 2 -> unitOL NOP + _ -> panic "maybeNOP: Unknown PowerPC 64-bit ABI" passArguments [] _ _ stackOffset accumCode accumUsed = return (stackOffset, accumCode, accumUsed) passArguments ((arg,arg_ty):args) gprs fprs stackOffset @@ -1806,7 +1807,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` storeWord vr_hi gprs stackOffset `snocOL` storeWord vr_lo (drop 1 gprs) (stackOffset+4)) ((take 2 gprs) ++ accumUsed) - GCPLinux -> + GCP32ELF -> do let stackOffset' = roundTo 8 stackOffset stackCode = accumCode `appOL` code `snocOL` ST II32 vr_hi (AddrRegImm sp (ImmInt stackOffset')) @@ -1826,7 +1827,7 @@ genCCall' dflags gcp target dest_regs args _ -> -- only one or no regs left passArguments args [] fprs (stackOffset'+8) stackCode accumUsed - GCPLinux64ELF _ -> panic "passArguments: 32 bit code" + GCP64ELF _ -> panic "passArguments: 32 bit code" passArguments ((arg,rep):args) gprs fprs stackOffset accumCode accumUsed | reg : _ <- regs = do @@ -1841,9 +1842,9 @@ genCCall' dflags gcp target dest_regs args -- ... so does the PowerOpen ABI. GCPAIX -> stackOffset + stackBytes -- ... the SysV ABI 32-bit doesn't. - GCPLinux -> stackOffset + GCP32ELF -> stackOffset -- ... but SysV ABI 64-bit does. - GCPLinux64ELF _ -> stackOffset + stackBytes + GCP64ELF _ -> stackOffset + stackBytes passArguments args (drop nGprs gprs) (drop nFprs fprs) @@ -1868,14 +1869,14 @@ genCCall' dflags gcp target dest_regs args -- The 32bit PowerOPEN ABI is happy with -- 32bit-alignment as well... stackOffset - GCPLinux + GCP32ELF -- ... the SysV ABI requires 8-byte -- alignment for doubles. | isFloatType rep && typeWidth rep == W64 -> roundTo 8 stackOffset | otherwise -> stackOffset - GCPLinux64ELF _ -> + GCP64ELF _ -> -- Everything on the stack is mapped to -- 8-byte aligned doublewords stackOffset @@ -1886,7 +1887,7 @@ genCCall' dflags gcp target dest_regs args -- "Single precision floating point values -- are mapped to the second word in a single -- doubleword" - GCPLinux64ELF 1 -> stackOffset' + 4 + GCP64ELF 1 -> stackOffset' + 4 _ -> stackOffset' | otherwise = stackOffset' @@ -1925,7 +1926,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (2, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux -> + GCP32ELF -> case cmmTypeFormat rep of II8 -> (1, 0, 4, gprs) II16 -> (1, 0, 4, gprs) @@ -1935,7 +1936,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (0, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux64ELF _ -> + GCP64ELF _ -> case cmmTypeFormat rep of II8 -> (1, 0, 8, gprs) II16 -> (1, 0, 8, gprs) --- CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +--- libraries/ghci/GHCi/InfoTable.hsc.orig 2019-07-06 09:00:10.880579000 +0200 ++++ libraries/ghci/GHCi/InfoTable.hsc 2019-07-06 08:59:23.613439000 +0200 +@@ -77,7 +77,7 @@ data Arch = ArchSPARC + | ArchARM + | ArchARM64 + | ArchPPC64 +- | ArchPPC64LE ++ | ArchPPC64_ELFv2 + | ArchUnknown + deriving Show + +@@ -99,8 +99,8 @@ platform = + ArchARM64 + #elif defined(powerpc64_HOST_ARCH) + ArchPPC64 +-#elif defined(powerpc64le_HOST_ARCH) +- ArchPPC64LE ++#elif defined(_CALL_ELF) && (_CALL_ELF == 2) ++ ArchPPC64_ELFv2 + #else + # if defined(TABLES_NEXT_TO_CODE) + # error Unimplemented architecture +@@ -252,7 +252,7 @@ mkJumpToAddr a = case platform of + 0xE96C0010, + 0x4E800420] + +- ArchPPC64LE -> ++ ArchPPC64_ELFv2 -> + -- The ABI requires r12 to point to the function's entry point. + -- We use the medium code model where code resides in the first + -- two gigabytes, so loading a non-negative32 bit address +--- rts/StgCRun.c.orig 2019-04-07 21:39:58.000000000 +0200 ++++ rts/StgCRun.c 2019-07-06 08:57:54.735161000 +0200 +@@ -747,9 +747,8 @@ StgRunIsImplementedInAssembler(void) + Everything is in assembler, so we don't have to deal with GCC... + -------------------------------------------------------------------------- */ + +-#if defined(powerpc64_HOST_ARCH) ++#if defined(ELF_V1) + +-#if defined(linux_HOST_OS) + static void GNUC3_ATTRIBUTE(used) + StgRunIsImplementedInAssembler(void) + { +@@ -871,13 +870,9 @@ StgRunIsImplementedInAssembler(void) + : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); + } + +-#else // linux_HOST_OS +-#error Only Linux support for power64 right now. + #endif + +-#endif +- +-#if defined(powerpc64le_HOST_ARCH) ++#if defined(ELF_V2) + /* ----------------------------------------------------------------------------- + PowerPC 64 little endian architecture + +--- rts/StgCRunAsm.S.orig 2018-06-12 22:33:31.000000000 +0200 ++++ rts/StgCRunAsm.S 2019-07-06 13:29:26.837367000 +0200 +@@ -1,8 +1,7 @@ + #include "ghcconfig.h" + #include "rts/Constants.h" + +-#if defined(powerpc64le_HOST_ARCH) +-# ifdef linux_HOST_OS ++#if defined(_CALL_ELF) && (_CALL_ELF == 2) + # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304 + .file "StgCRun.c" + .abiversion 2 +@@ -13,6 +12,8 @@ + .hidden StgRun + .type StgRun,@function + StgRun: ++ addis %r2, %r12, .TOC.-StgRun@ha ++ addi %r2, %r2, .TOC.-StgRun@l + .localentry StgRun,.-StgRun + mflr 0 + mr 5, 1 +@@ -108,9 +109,6 @@ StgReturn: + blr + + .section .note.GNU-stack,"",@progbits +-# else // linux_HOST_OS +-# error Only Linux support for power64 little endian right now. +-# endif + + #elif defined(powerpc_HOST_ARCH) + # if defined(aix_HOST_OS) Index: head/lang/ghc/files862/patch-ppc64 =================================================================== --- head/lang/ghc/files862/patch-ppc64 (revision 506141) +++ head/lang/ghc/files862/patch-ppc64 (revision 506142) @@ -1,411 +1,465 @@ --- libraries/containers/include/containers.h +++ libraries/containers/include/containers.h @@ -35,7 +35,6 @@ #ifdef __GLASGOW_HASKELL__ # define USE_ST_MONAD 1 -# define USE_UNBOXED_ARRAYS 1 #endif #endif -From cbdb2dcf8ff0702d0a52f8fc3ee0288c9dde0e92 Mon Sep 17 00:00:00 2001 -From: Peter Trommler -Date: Fri, 28 Dec 2018 22:30:34 +0100 -Subject: [PATCH] RTS: Use ELF v1 convention on all powerpc64 systems - ---- - rts/StgCRun.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/rts/StgCRun.c b/rts/StgCRun.c -index 92b0696c2b..4480198564 100644 ---- rts/StgCRun.c -+++ rts/StgCRun.c -@@ -749,7 +749,6 @@ StgRunIsImplementedInAssembler(void) - - #if defined(powerpc64_HOST_ARCH) - --#if defined(linux_HOST_OS) - static void GNUC3_ATTRIBUTE(used) - StgRunIsImplementedInAssembler(void) - { -@@ -871,10 +870,6 @@ StgRunIsImplementedInAssembler(void) - : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); - } - --#else // linux_HOST_OS --#error Only Linux support for power64 right now. --#endif -- - #endif - - #if defined(powerpc64le_HOST_ARCH) - - - - From f4399ce96514ab58d766de999896780e93c886c6 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:52:31 +0100 Subject: [PATCH] PPC NCG: Make calling convention more general All operating systems except AIX and Darwin follow the ELF specification. --- compiler/nativeGen/PPC/CodeGen.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index efd9591c71..56e3bc280b 100644 --- compiler/nativeGen/PPC/CodeGen.hs +++ compiler/nativeGen/PPC/CodeGen.hs @@ -1565,18 +1565,17 @@ genCCall target dest_regs argsAndHints = panic "genCall: Wrong number of arguments/results for fabs" -- TODO: replace 'Int' by an enum such as 'PPC_64ABI' -data GenCCallPlatform = GCPLinux | GCPDarwin | GCPLinux64ELF !Int | GCPAIX +data GenCCallPlatform = GCP32ELF | GCP64ELF !Int | GCPAIX | GCPDarwin platformToGCP :: Platform -> GenCCallPlatform platformToGCP platform = case platformOS platform of - OSLinux -> case platformArch platform of - ArchPPC -> GCPLinux - ArchPPC_64 ELF_V1 -> GCPLinux64ELF 1 - ArchPPC_64 ELF_V2 -> GCPLinux64ELF 2 - _ -> panic "PPC.CodeGen.platformToGCP: Unknown Linux" OSAIX -> GCPAIX OSDarwin -> GCPDarwin - _ -> panic "PPC.CodeGen.platformToGCP: not defined for this OS" + _ -> case platformArch platform of + ArchPPC -> GCP32ELF + ArchPPC_64 ELF_V1 -> GCP64ELF 1 + ArchPPC_64 ELF_V2 -> GCP64ELF 2 + _ -> panic "platformToGCP: Not PowerPC" genCCall' -- 2.19.2 From fa2128cb78a8b365d822c23b8da19fa14ac23ce3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:55:35 +0100 Subject: [PATCH] PPC NCG: Make `stackHeaderSize` more general --- compiler/nativeGen/PPC/Instr.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs index 8eb5e8fa8d..ce421ed4bf 100644 --- compiler/nativeGen/PPC/Instr.hs +++ compiler/nativeGen/PPC/Instr.hs @@ -573,15 +573,14 @@ ppc_mkLoadInstr dflags reg delta slot stackFrameHeaderSize :: DynFlags -> Int stackFrameHeaderSize dflags = case platformOS platform of - OSLinux -> case platformArch platform of - -- header + parameter save area - ArchPPC -> 64 -- TODO: check ABI spec - ArchPPC_64 ELF_V1 -> 48 + 8 * 8 - ArchPPC_64 ELF_V2 -> 32 + 8 * 8 - _ -> panic "PPC.stackFrameHeaderSize: Unknown Linux" OSAIX -> 24 + 8 * 4 OSDarwin -> 64 -- TODO: check ABI spec - _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" + _ -> case platformArch platform of + -- header + parameter save area + ArchPPC -> 64 -- TODO: check ABI spec + ArchPPC_64 ELF_V1 -> 48 + 8 * 8 + ArchPPC_64 ELF_V2 -> 32 + 8 * 8 + _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" where platform = targetPlatform dflags -- | The maximum number of bytes required to spill a register. PPC32 -- 2.19.2 From 3472824eee7c616aaf755c147ef2c3e4d79fbec4 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:12:48 +0100 Subject: [PATCH] PPC NCG: GOT declaration for all 64-bit ELF systems --- compiler/nativeGen/PIC.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs index 2f300c4614..7be7a860f7 100644 --- compiler/nativeGen/PIC.hs +++ compiler/nativeGen/PIC.hs @@ -527,19 +527,17 @@ pprGotDeclaration _ _ OSAIX ] --- PPC 64 ELF v1 needs a Table Of Contents (TOC) on Linux -pprGotDeclaration _ (ArchPPC_64 ELF_V1) OSLinux +-- PPC 64 ELF v1 needs a Table Of Contents (TOC) +pprGotDeclaration _ (ArchPPC_64 ELF_V1) _ = text ".section \".toc\",\"aw\"" -- In ELF v2 we also need to tell the assembler that we want ABI -- version 2. This would normally be done at the top of the file -- right after a file directive, but I could not figure out how -- to do that. -pprGotDeclaration _ (ArchPPC_64 ELF_V2) OSLinux +pprGotDeclaration _ (ArchPPC_64 ELF_V2) _ = vcat [ text ".abiversion 2", text ".section \".toc\",\"aw\"" ] -pprGotDeclaration _ (ArchPPC_64 _) _ - = panic "pprGotDeclaration: ArchPPC_64 only Linux supported" -- Emit GOT declaration -- Output whatever needs to be output once per .s file. -- 2.19.2 From 749e343ef07aeeb71fe38c432f1b88ad8a6d2a58 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:14:12 +0100 Subject: [PATCH] PPC NCG: Register definitions for all 64-bit systems --- compiler/nativeGen/PPC/Regs.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs index 227517be88..7a6d6ed8e5 100644 --- compiler/nativeGen/PPC/Regs.hs +++ compiler/nativeGen/PPC/Regs.hs @@ -229,12 +229,8 @@ allArgRegs = map regSingle [3..10] -- these are the regs which we cannot assume stay alive over a C call. callClobberedRegs :: Platform -> [Reg] -callClobberedRegs platform - = case platformOS platform of - OSAIX -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSDarwin -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSLinux -> map regSingle (0:[2..13] ++ map fReg [0..13]) - _ -> panic "PPC.Regs.callClobberedRegs: not defined for this architecture" +callClobberedRegs _platform + = map regSingle (0:[2..12] ++ map fReg [0..13]) allMachRegNos :: [RegNo] @@ -265,11 +261,10 @@ allFPArgRegs platform = case platformOS platform of OSAIX -> map (regSingle . fReg) [1..13] OSDarwin -> map (regSingle . fReg) [1..13] - OSLinux -> case platformArch platform of + _ -> case platformArch platform of ArchPPC -> map (regSingle . fReg) [1..8] ArchPPC_64 _ -> map (regSingle . fReg) [1..13] _ -> panic "PPC.Regs.allFPArgRegs: unknown PPC Linux" - _ -> panic "PPC.Regs.allFPArgRegs: not defined for this architecture" fits16Bits :: Integral a => a -> Bool fits16Bits x = x >= -32768 && x < 32768 -- 2.19.2 From 19731a77ed203870f76a53eaf01758efbb5144d3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sun, 13 Jan 2019 15:16:28 +0100 Subject: [PATCH] PPC NCG: Emit type declaration on all ELF systems --- compiler/nativeGen/PPC/Ppr.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs index 2f64d82ee5..82726d90d9 100644 --- compiler/nativeGen/PPC/Ppr.hs +++ compiler/nativeGen/PPC/Ppr.hs @@ -142,9 +142,8 @@ pprGloblDecl lbl pprTypeAndSizeDecl :: CLabel -> SDoc pprTypeAndSizeDecl lbl = sdocWithPlatform $ \platform -> - if platformOS platform == OSLinux && externallyVisibleCLabel lbl - then text ".type " <> - ppr lbl <> text ", @object" + if osElfTarget (platformOS platform) && externallyVisibleCLabel lbl + then text "\t.type " <> ppr lbl <> text ", @object" else empty pprLabel :: CLabel -> SDoc -- 2.19.2 --- compiler/nativeGen/PPC/CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +++ compiler/nativeGen/PPC/CodeGen.hs 2019-01-17 10:03:25.018164000 +0100 @@ -1047,7 +1047,7 @@ genJump tree genJump' :: CmmExpr -> GenCCallPlatform -> NatM InstrBlock -genJump' tree (GCPLinux64ELF 1) +genJump' tree (GCP64ELF 1) = do (target,code) <- getSomeReg tree return (code @@ -1057,7 +1057,7 @@ genJump' tree (GCPLinux64ELF 1) `snocOL` LD II64 r11 (AddrRegImm target (ImmInt 16)) `snocOL` BCTR [] Nothing) -genJump' tree (GCPLinux64ELF 2) +genJump' tree (GCP64ELF 2) = do (target,code) <- getSomeReg tree return (code @@ -1667,7 +1667,7 @@ genCCall' dflags gcp target dest_regs args Right dyn -> do -- implement call through function pointer (dynReg, dynCode) <- getSomeReg dyn case gcp of - GCPLinux64ELF 1 -> return ( dynCode + GCP64ELF 1 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 40)) `snocOL` LD II64 r11 (AddrRegImm dynReg (ImmInt 0)) @@ -1677,7 +1677,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` BCTRL usedRegs `snocOL` LD spFormat toc (AddrRegImm sp (ImmInt 40)) `appOL` codeAfter) - GCPLinux64ELF 2 -> return ( dynCode + GCP64ELF 2 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 24)) `snocOL` MR r12 dynReg @@ -1715,9 +1715,9 @@ genCCall' dflags gcp target dest_regs args initialStackOffset = case gcp of GCPAIX -> 24 GCPDarwin -> 24 - GCPLinux -> 8 - GCPLinux64ELF 1 -> 48 - GCPLinux64ELF 2 -> 32 + GCP32ELF -> 8 + GCP64ELF 1 -> 48 + GCP64ELF 2 -> 32 _ -> panic "genCall': unknown calling convention" -- size of linkage area + size of arguments, in bytes stackDelta finalStack = case gcp of @@ -1727,12 +1727,12 @@ genCCall' dflags gcp target dest_regs args GCPDarwin -> roundTo 16 $ (24 +) $ max 32 $ sum $ map (widthInBytes . typeWidth) argReps - GCPLinux -> roundTo 16 finalStack - GCPLinux64ELF 1 -> + GCP32ELF -> roundTo 16 finalStack + GCP64ELF 1 -> roundTo 16 $ (48 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps - GCPLinux64ELF 2 -> + GCP64ELF 2 -> roundTo 16 $ (32 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps @@ -1765,13 +1765,14 @@ genCCall' dflags gcp target dest_regs args -- link editor replaces the NOP instruction with a load of the TOC -- from the stack to restore the TOC. maybeNOP = case gcp of + GCP32ELF -> nilOL -- See Section 3.9.4 of OpenPower ABI GCPAIX -> unitOL NOP -- See Section 3.5.11 of PPC64 ELF v1.9 - GCPLinux64ELF 1 -> unitOL NOP + GCP64ELF 1 -> unitOL NOP -- See Section 2.3.6 of PPC64 ELF v2 - GCPLinux64ELF 2 -> unitOL NOP - _ -> nilOL + GCP64ELF 2 -> unitOL NOP + _ -> panic "maybeNOP: Unknown PowerPC 64-bit ABI" passArguments [] _ _ stackOffset accumCode accumUsed = return (stackOffset, accumCode, accumUsed) passArguments ((arg,arg_ty):args) gprs fprs stackOffset @@ -1806,7 +1807,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` storeWord vr_hi gprs stackOffset `snocOL` storeWord vr_lo (drop 1 gprs) (stackOffset+4)) ((take 2 gprs) ++ accumUsed) - GCPLinux -> + GCP32ELF -> do let stackOffset' = roundTo 8 stackOffset stackCode = accumCode `appOL` code `snocOL` ST II32 vr_hi (AddrRegImm sp (ImmInt stackOffset')) @@ -1826,7 +1827,7 @@ genCCall' dflags gcp target dest_regs args _ -> -- only one or no regs left passArguments args [] fprs (stackOffset'+8) stackCode accumUsed - GCPLinux64ELF _ -> panic "passArguments: 32 bit code" + GCP64ELF _ -> panic "passArguments: 32 bit code" passArguments ((arg,rep):args) gprs fprs stackOffset accumCode accumUsed | reg : _ <- regs = do @@ -1841,9 +1842,9 @@ genCCall' dflags gcp target dest_regs args -- ... so does the PowerOpen ABI. GCPAIX -> stackOffset + stackBytes -- ... the SysV ABI 32-bit doesn't. - GCPLinux -> stackOffset + GCP32ELF -> stackOffset -- ... but SysV ABI 64-bit does. - GCPLinux64ELF _ -> stackOffset + stackBytes + GCP64ELF _ -> stackOffset + stackBytes passArguments args (drop nGprs gprs) (drop nFprs fprs) @@ -1868,14 +1869,14 @@ genCCall' dflags gcp target dest_regs args -- The 32bit PowerOPEN ABI is happy with -- 32bit-alignment as well... stackOffset - GCPLinux + GCP32ELF -- ... the SysV ABI requires 8-byte -- alignment for doubles. | isFloatType rep && typeWidth rep == W64 -> roundTo 8 stackOffset | otherwise -> stackOffset - GCPLinux64ELF _ -> + GCP64ELF _ -> -- Everything on the stack is mapped to -- 8-byte aligned doublewords stackOffset @@ -1886,7 +1887,7 @@ genCCall' dflags gcp target dest_regs args -- "Single precision floating point values -- are mapped to the second word in a single -- doubleword" - GCPLinux64ELF 1 -> stackOffset' + 4 + GCP64ELF 1 -> stackOffset' + 4 _ -> stackOffset' | otherwise = stackOffset' @@ -1925,7 +1926,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (2, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux -> + GCP32ELF -> case cmmTypeFormat rep of II8 -> (1, 0, 4, gprs) II16 -> (1, 0, 4, gprs) @@ -1935,7 +1936,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (0, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux64ELF _ -> + GCP64ELF _ -> case cmmTypeFormat rep of II8 -> (1, 0, 8, gprs) II16 -> (1, 0, 8, gprs) --- CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +--- libraries/ghci/GHCi/InfoTable.hsc.orig 2019-07-06 09:00:10.880579000 +0200 ++++ libraries/ghci/GHCi/InfoTable.hsc 2019-07-06 08:59:23.613439000 +0200 +@@ -77,7 +77,7 @@ data Arch = ArchSPARC + | ArchARM + | ArchARM64 + | ArchPPC64 +- | ArchPPC64LE ++ | ArchPPC64_ELFv2 + | ArchUnknown + deriving Show + +@@ -99,8 +99,8 @@ platform = + ArchARM64 + #elif defined(powerpc64_HOST_ARCH) + ArchPPC64 +-#elif defined(powerpc64le_HOST_ARCH) +- ArchPPC64LE ++#elif defined(_CALL_ELF) && (_CALL_ELF == 2) ++ ArchPPC64_ELFv2 + #else + # if defined(TABLES_NEXT_TO_CODE) + # error Unimplemented architecture +@@ -252,7 +252,7 @@ mkJumpToAddr a = case platform of + 0xE96C0010, + 0x4E800420] + +- ArchPPC64LE -> ++ ArchPPC64_ELFv2 -> + -- The ABI requires r12 to point to the function's entry point. + -- We use the medium code model where code resides in the first + -- two gigabytes, so loading a non-negative32 bit address +--- rts/StgCRun.c.orig 2019-04-07 21:39:58.000000000 +0200 ++++ rts/StgCRun.c 2019-07-06 08:57:54.735161000 +0200 +@@ -747,9 +747,8 @@ StgRunIsImplementedInAssembler(void) + Everything is in assembler, so we don't have to deal with GCC... + -------------------------------------------------------------------------- */ + +-#if defined(powerpc64_HOST_ARCH) ++#if defined(ELF_V1) + +-#if defined(linux_HOST_OS) + static void GNUC3_ATTRIBUTE(used) + StgRunIsImplementedInAssembler(void) + { +@@ -871,13 +870,9 @@ StgRunIsImplementedInAssembler(void) + : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); + } + +-#else // linux_HOST_OS +-#error Only Linux support for power64 right now. + #endif + +-#endif +- +-#if defined(powerpc64le_HOST_ARCH) ++#if defined(ELF_V2) + /* ----------------------------------------------------------------------------- + PowerPC 64 little endian architecture + +--- rts/StgCRunAsm.S.orig 2018-06-12 22:33:31.000000000 +0200 ++++ rts/StgCRunAsm.S 2019-07-06 13:29:26.837367000 +0200 +@@ -1,8 +1,7 @@ + #include "ghcconfig.h" + #include "rts/Constants.h" + +-#if defined(powerpc64le_HOST_ARCH) +-# ifdef linux_HOST_OS ++#if defined(_CALL_ELF) && (_CALL_ELF == 2) + # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304 + .file "StgCRun.c" + .abiversion 2 +@@ -13,6 +12,8 @@ + .hidden StgRun + .type StgRun,@function + StgRun: ++ addis %r2, %r12, .TOC.-StgRun@ha ++ addi %r2, %r2, .TOC.-StgRun@l + .localentry StgRun,.-StgRun + mflr 0 + mr 5, 1 +@@ -108,9 +109,6 @@ StgReturn: + blr + + .section .note.GNU-stack,"",@progbits +-# else // linux_HOST_OS +-# error Only Linux support for power64 little endian right now. +-# endif + + #elif defined(powerpc_HOST_ARCH) + # if defined(aix_HOST_OS) Index: head/lang/ghc/files863/patch-ppc64 =================================================================== --- head/lang/ghc/files863/patch-ppc64 (revision 506141) +++ head/lang/ghc/files863/patch-ppc64 (revision 506142) @@ -1,411 +1,465 @@ --- libraries/containers/include/containers.h +++ libraries/containers/include/containers.h @@ -35,7 +35,6 @@ #ifdef __GLASGOW_HASKELL__ # define USE_ST_MONAD 1 -# define USE_UNBOXED_ARRAYS 1 #endif #endif -From cbdb2dcf8ff0702d0a52f8fc3ee0288c9dde0e92 Mon Sep 17 00:00:00 2001 -From: Peter Trommler -Date: Fri, 28 Dec 2018 22:30:34 +0100 -Subject: [PATCH] RTS: Use ELF v1 convention on all powerpc64 systems - ---- - rts/StgCRun.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/rts/StgCRun.c b/rts/StgCRun.c -index 92b0696c2b..4480198564 100644 ---- rts/StgCRun.c -+++ rts/StgCRun.c -@@ -749,7 +749,6 @@ StgRunIsImplementedInAssembler(void) - - #if defined(powerpc64_HOST_ARCH) - --#if defined(linux_HOST_OS) - static void GNUC3_ATTRIBUTE(used) - StgRunIsImplementedInAssembler(void) - { -@@ -871,10 +870,6 @@ StgRunIsImplementedInAssembler(void) - : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); - } - --#else // linux_HOST_OS --#error Only Linux support for power64 right now. --#endif -- - #endif - - #if defined(powerpc64le_HOST_ARCH) - - - - From f4399ce96514ab58d766de999896780e93c886c6 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:52:31 +0100 Subject: [PATCH] PPC NCG: Make calling convention more general All operating systems except AIX and Darwin follow the ELF specification. --- compiler/nativeGen/PPC/CodeGen.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index efd9591c71..56e3bc280b 100644 --- compiler/nativeGen/PPC/CodeGen.hs +++ compiler/nativeGen/PPC/CodeGen.hs @@ -1565,18 +1565,17 @@ genCCall target dest_regs argsAndHints = panic "genCall: Wrong number of arguments/results for fabs" -- TODO: replace 'Int' by an enum such as 'PPC_64ABI' -data GenCCallPlatform = GCPLinux | GCPDarwin | GCPLinux64ELF !Int | GCPAIX +data GenCCallPlatform = GCP32ELF | GCP64ELF !Int | GCPAIX | GCPDarwin platformToGCP :: Platform -> GenCCallPlatform platformToGCP platform = case platformOS platform of - OSLinux -> case platformArch platform of - ArchPPC -> GCPLinux - ArchPPC_64 ELF_V1 -> GCPLinux64ELF 1 - ArchPPC_64 ELF_V2 -> GCPLinux64ELF 2 - _ -> panic "PPC.CodeGen.platformToGCP: Unknown Linux" OSAIX -> GCPAIX OSDarwin -> GCPDarwin - _ -> panic "PPC.CodeGen.platformToGCP: not defined for this OS" + _ -> case platformArch platform of + ArchPPC -> GCP32ELF + ArchPPC_64 ELF_V1 -> GCP64ELF 1 + ArchPPC_64 ELF_V2 -> GCP64ELF 2 + _ -> panic "platformToGCP: Not PowerPC" genCCall' -- 2.19.2 From fa2128cb78a8b365d822c23b8da19fa14ac23ce3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:55:35 +0100 Subject: [PATCH] PPC NCG: Make `stackHeaderSize` more general --- compiler/nativeGen/PPC/Instr.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs index 8eb5e8fa8d..ce421ed4bf 100644 --- compiler/nativeGen/PPC/Instr.hs +++ compiler/nativeGen/PPC/Instr.hs @@ -573,15 +573,14 @@ ppc_mkLoadInstr dflags reg delta slot stackFrameHeaderSize :: DynFlags -> Int stackFrameHeaderSize dflags = case platformOS platform of - OSLinux -> case platformArch platform of - -- header + parameter save area - ArchPPC -> 64 -- TODO: check ABI spec - ArchPPC_64 ELF_V1 -> 48 + 8 * 8 - ArchPPC_64 ELF_V2 -> 32 + 8 * 8 - _ -> panic "PPC.stackFrameHeaderSize: Unknown Linux" OSAIX -> 24 + 8 * 4 OSDarwin -> 64 -- TODO: check ABI spec - _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" + _ -> case platformArch platform of + -- header + parameter save area + ArchPPC -> 64 -- TODO: check ABI spec + ArchPPC_64 ELF_V1 -> 48 + 8 * 8 + ArchPPC_64 ELF_V2 -> 32 + 8 * 8 + _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" where platform = targetPlatform dflags -- | The maximum number of bytes required to spill a register. PPC32 -- 2.19.2 From 3472824eee7c616aaf755c147ef2c3e4d79fbec4 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:12:48 +0100 Subject: [PATCH] PPC NCG: GOT declaration for all 64-bit ELF systems --- compiler/nativeGen/PIC.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs index 2f300c4614..7be7a860f7 100644 --- compiler/nativeGen/PIC.hs +++ compiler/nativeGen/PIC.hs @@ -527,19 +527,17 @@ pprGotDeclaration _ _ OSAIX ] --- PPC 64 ELF v1 needs a Table Of Contents (TOC) on Linux -pprGotDeclaration _ (ArchPPC_64 ELF_V1) OSLinux +-- PPC 64 ELF v1 needs a Table Of Contents (TOC) +pprGotDeclaration _ (ArchPPC_64 ELF_V1) _ = text ".section \".toc\",\"aw\"" -- In ELF v2 we also need to tell the assembler that we want ABI -- version 2. This would normally be done at the top of the file -- right after a file directive, but I could not figure out how -- to do that. -pprGotDeclaration _ (ArchPPC_64 ELF_V2) OSLinux +pprGotDeclaration _ (ArchPPC_64 ELF_V2) _ = vcat [ text ".abiversion 2", text ".section \".toc\",\"aw\"" ] -pprGotDeclaration _ (ArchPPC_64 _) _ - = panic "pprGotDeclaration: ArchPPC_64 only Linux supported" -- Emit GOT declaration -- Output whatever needs to be output once per .s file. -- 2.19.2 From 749e343ef07aeeb71fe38c432f1b88ad8a6d2a58 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:14:12 +0100 Subject: [PATCH] PPC NCG: Register definitions for all 64-bit systems --- compiler/nativeGen/PPC/Regs.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs index 227517be88..7a6d6ed8e5 100644 --- compiler/nativeGen/PPC/Regs.hs +++ compiler/nativeGen/PPC/Regs.hs @@ -229,12 +229,8 @@ allArgRegs = map regSingle [3..10] -- these are the regs which we cannot assume stay alive over a C call. callClobberedRegs :: Platform -> [Reg] -callClobberedRegs platform - = case platformOS platform of - OSAIX -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSDarwin -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSLinux -> map regSingle (0:[2..13] ++ map fReg [0..13]) - _ -> panic "PPC.Regs.callClobberedRegs: not defined for this architecture" +callClobberedRegs _platform + = map regSingle (0:[2..12] ++ map fReg [0..13]) allMachRegNos :: [RegNo] @@ -265,11 +261,10 @@ allFPArgRegs platform = case platformOS platform of OSAIX -> map (regSingle . fReg) [1..13] OSDarwin -> map (regSingle . fReg) [1..13] - OSLinux -> case platformArch platform of + _ -> case platformArch platform of ArchPPC -> map (regSingle . fReg) [1..8] ArchPPC_64 _ -> map (regSingle . fReg) [1..13] _ -> panic "PPC.Regs.allFPArgRegs: unknown PPC Linux" - _ -> panic "PPC.Regs.allFPArgRegs: not defined for this architecture" fits16Bits :: Integral a => a -> Bool fits16Bits x = x >= -32768 && x < 32768 -- 2.19.2 From 19731a77ed203870f76a53eaf01758efbb5144d3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sun, 13 Jan 2019 15:16:28 +0100 Subject: [PATCH] PPC NCG: Emit type declaration on all ELF systems --- compiler/nativeGen/PPC/Ppr.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs index 2f64d82ee5..82726d90d9 100644 --- compiler/nativeGen/PPC/Ppr.hs +++ compiler/nativeGen/PPC/Ppr.hs @@ -142,9 +142,8 @@ pprGloblDecl lbl pprTypeAndSizeDecl :: CLabel -> SDoc pprTypeAndSizeDecl lbl = sdocWithPlatform $ \platform -> - if platformOS platform == OSLinux && externallyVisibleCLabel lbl - then text ".type " <> - ppr lbl <> text ", @object" + if osElfTarget (platformOS platform) && externallyVisibleCLabel lbl + then text "\t.type " <> ppr lbl <> text ", @object" else empty pprLabel :: CLabel -> SDoc -- 2.19.2 --- compiler/nativeGen/PPC/CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +++ compiler/nativeGen/PPC/CodeGen.hs 2019-01-17 10:03:25.018164000 +0100 @@ -1047,7 +1047,7 @@ genJump tree genJump' :: CmmExpr -> GenCCallPlatform -> NatM InstrBlock -genJump' tree (GCPLinux64ELF 1) +genJump' tree (GCP64ELF 1) = do (target,code) <- getSomeReg tree return (code @@ -1057,7 +1057,7 @@ genJump' tree (GCPLinux64ELF 1) `snocOL` LD II64 r11 (AddrRegImm target (ImmInt 16)) `snocOL` BCTR [] Nothing) -genJump' tree (GCPLinux64ELF 2) +genJump' tree (GCP64ELF 2) = do (target,code) <- getSomeReg tree return (code @@ -1667,7 +1667,7 @@ genCCall' dflags gcp target dest_regs args Right dyn -> do -- implement call through function pointer (dynReg, dynCode) <- getSomeReg dyn case gcp of - GCPLinux64ELF 1 -> return ( dynCode + GCP64ELF 1 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 40)) `snocOL` LD II64 r11 (AddrRegImm dynReg (ImmInt 0)) @@ -1677,7 +1677,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` BCTRL usedRegs `snocOL` LD spFormat toc (AddrRegImm sp (ImmInt 40)) `appOL` codeAfter) - GCPLinux64ELF 2 -> return ( dynCode + GCP64ELF 2 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 24)) `snocOL` MR r12 dynReg @@ -1715,9 +1715,9 @@ genCCall' dflags gcp target dest_regs args initialStackOffset = case gcp of GCPAIX -> 24 GCPDarwin -> 24 - GCPLinux -> 8 - GCPLinux64ELF 1 -> 48 - GCPLinux64ELF 2 -> 32 + GCP32ELF -> 8 + GCP64ELF 1 -> 48 + GCP64ELF 2 -> 32 _ -> panic "genCall': unknown calling convention" -- size of linkage area + size of arguments, in bytes stackDelta finalStack = case gcp of @@ -1727,12 +1727,12 @@ genCCall' dflags gcp target dest_regs args GCPDarwin -> roundTo 16 $ (24 +) $ max 32 $ sum $ map (widthInBytes . typeWidth) argReps - GCPLinux -> roundTo 16 finalStack - GCPLinux64ELF 1 -> + GCP32ELF -> roundTo 16 finalStack + GCP64ELF 1 -> roundTo 16 $ (48 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps - GCPLinux64ELF 2 -> + GCP64ELF 2 -> roundTo 16 $ (32 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps @@ -1765,13 +1765,14 @@ genCCall' dflags gcp target dest_regs args -- link editor replaces the NOP instruction with a load of the TOC -- from the stack to restore the TOC. maybeNOP = case gcp of + GCP32ELF -> nilOL -- See Section 3.9.4 of OpenPower ABI GCPAIX -> unitOL NOP -- See Section 3.5.11 of PPC64 ELF v1.9 - GCPLinux64ELF 1 -> unitOL NOP + GCP64ELF 1 -> unitOL NOP -- See Section 2.3.6 of PPC64 ELF v2 - GCPLinux64ELF 2 -> unitOL NOP - _ -> nilOL + GCP64ELF 2 -> unitOL NOP + _ -> panic "maybeNOP: Unknown PowerPC 64-bit ABI" passArguments [] _ _ stackOffset accumCode accumUsed = return (stackOffset, accumCode, accumUsed) passArguments ((arg,arg_ty):args) gprs fprs stackOffset @@ -1806,7 +1807,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` storeWord vr_hi gprs stackOffset `snocOL` storeWord vr_lo (drop 1 gprs) (stackOffset+4)) ((take 2 gprs) ++ accumUsed) - GCPLinux -> + GCP32ELF -> do let stackOffset' = roundTo 8 stackOffset stackCode = accumCode `appOL` code `snocOL` ST II32 vr_hi (AddrRegImm sp (ImmInt stackOffset')) @@ -1826,7 +1827,7 @@ genCCall' dflags gcp target dest_regs args _ -> -- only one or no regs left passArguments args [] fprs (stackOffset'+8) stackCode accumUsed - GCPLinux64ELF _ -> panic "passArguments: 32 bit code" + GCP64ELF _ -> panic "passArguments: 32 bit code" passArguments ((arg,rep):args) gprs fprs stackOffset accumCode accumUsed | reg : _ <- regs = do @@ -1841,9 +1842,9 @@ genCCall' dflags gcp target dest_regs args -- ... so does the PowerOpen ABI. GCPAIX -> stackOffset + stackBytes -- ... the SysV ABI 32-bit doesn't. - GCPLinux -> stackOffset + GCP32ELF -> stackOffset -- ... but SysV ABI 64-bit does. - GCPLinux64ELF _ -> stackOffset + stackBytes + GCP64ELF _ -> stackOffset + stackBytes passArguments args (drop nGprs gprs) (drop nFprs fprs) @@ -1868,14 +1869,14 @@ genCCall' dflags gcp target dest_regs args -- The 32bit PowerOPEN ABI is happy with -- 32bit-alignment as well... stackOffset - GCPLinux + GCP32ELF -- ... the SysV ABI requires 8-byte -- alignment for doubles. | isFloatType rep && typeWidth rep == W64 -> roundTo 8 stackOffset | otherwise -> stackOffset - GCPLinux64ELF _ -> + GCP64ELF _ -> -- Everything on the stack is mapped to -- 8-byte aligned doublewords stackOffset @@ -1886,7 +1887,7 @@ genCCall' dflags gcp target dest_regs args -- "Single precision floating point values -- are mapped to the second word in a single -- doubleword" - GCPLinux64ELF 1 -> stackOffset' + 4 + GCP64ELF 1 -> stackOffset' + 4 _ -> stackOffset' | otherwise = stackOffset' @@ -1925,7 +1926,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (2, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux -> + GCP32ELF -> case cmmTypeFormat rep of II8 -> (1, 0, 4, gprs) II16 -> (1, 0, 4, gprs) @@ -1935,7 +1936,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (0, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux64ELF _ -> + GCP64ELF _ -> case cmmTypeFormat rep of II8 -> (1, 0, 8, gprs) II16 -> (1, 0, 8, gprs) --- CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +--- libraries/ghci/GHCi/InfoTable.hsc.orig 2019-07-06 09:00:10.880579000 +0200 ++++ libraries/ghci/GHCi/InfoTable.hsc 2019-07-06 08:59:23.613439000 +0200 +@@ -77,7 +77,7 @@ data Arch = ArchSPARC + | ArchARM + | ArchARM64 + | ArchPPC64 +- | ArchPPC64LE ++ | ArchPPC64_ELFv2 + | ArchUnknown + deriving Show + +@@ -99,8 +99,8 @@ platform = + ArchARM64 + #elif defined(powerpc64_HOST_ARCH) + ArchPPC64 +-#elif defined(powerpc64le_HOST_ARCH) +- ArchPPC64LE ++#elif defined(_CALL_ELF) && (_CALL_ELF == 2) ++ ArchPPC64_ELFv2 + #else + # if defined(TABLES_NEXT_TO_CODE) + # error Unimplemented architecture +@@ -252,7 +252,7 @@ mkJumpToAddr a = case platform of + 0xE96C0010, + 0x4E800420] + +- ArchPPC64LE -> ++ ArchPPC64_ELFv2 -> + -- The ABI requires r12 to point to the function's entry point. + -- We use the medium code model where code resides in the first + -- two gigabytes, so loading a non-negative32 bit address +--- rts/StgCRun.c.orig 2019-04-07 21:39:58.000000000 +0200 ++++ rts/StgCRun.c 2019-07-06 08:57:54.735161000 +0200 +@@ -747,9 +747,8 @@ StgRunIsImplementedInAssembler(void) + Everything is in assembler, so we don't have to deal with GCC... + -------------------------------------------------------------------------- */ + +-#if defined(powerpc64_HOST_ARCH) ++#if defined(ELF_V1) + +-#if defined(linux_HOST_OS) + static void GNUC3_ATTRIBUTE(used) + StgRunIsImplementedInAssembler(void) + { +@@ -871,13 +870,9 @@ StgRunIsImplementedInAssembler(void) + : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); + } + +-#else // linux_HOST_OS +-#error Only Linux support for power64 right now. + #endif + +-#endif +- +-#if defined(powerpc64le_HOST_ARCH) ++#if defined(ELF_V2) + /* ----------------------------------------------------------------------------- + PowerPC 64 little endian architecture + +--- rts/StgCRunAsm.S.orig 2018-06-12 22:33:31.000000000 +0200 ++++ rts/StgCRunAsm.S 2019-07-06 13:29:26.837367000 +0200 +@@ -1,8 +1,7 @@ + #include "ghcconfig.h" + #include "rts/Constants.h" + +-#if defined(powerpc64le_HOST_ARCH) +-# ifdef linux_HOST_OS ++#if defined(_CALL_ELF) && (_CALL_ELF == 2) + # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304 + .file "StgCRun.c" + .abiversion 2 +@@ -13,6 +12,8 @@ + .hidden StgRun + .type StgRun,@function + StgRun: ++ addis %r2, %r12, .TOC.-StgRun@ha ++ addi %r2, %r2, .TOC.-StgRun@l + .localentry StgRun,.-StgRun + mflr 0 + mr 5, 1 +@@ -108,9 +109,6 @@ StgReturn: + blr + + .section .note.GNU-stack,"",@progbits +-# else // linux_HOST_OS +-# error Only Linux support for power64 little endian right now. +-# endif + + #elif defined(powerpc_HOST_ARCH) + # if defined(aix_HOST_OS) Index: head/lang/ghc/files864/patch-ppc64 =================================================================== --- head/lang/ghc/files864/patch-ppc64 (revision 506141) +++ head/lang/ghc/files864/patch-ppc64 (revision 506142) @@ -1,411 +1,465 @@ --- libraries/containers/include/containers.h +++ libraries/containers/include/containers.h @@ -35,7 +35,6 @@ #ifdef __GLASGOW_HASKELL__ # define USE_ST_MONAD 1 -# define USE_UNBOXED_ARRAYS 1 #endif #endif -From cbdb2dcf8ff0702d0a52f8fc3ee0288c9dde0e92 Mon Sep 17 00:00:00 2001 -From: Peter Trommler -Date: Fri, 28 Dec 2018 22:30:34 +0100 -Subject: [PATCH] RTS: Use ELF v1 convention on all powerpc64 systems - ---- - rts/StgCRun.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/rts/StgCRun.c b/rts/StgCRun.c -index 92b0696c2b..4480198564 100644 ---- rts/StgCRun.c -+++ rts/StgCRun.c -@@ -749,7 +749,6 @@ StgRunIsImplementedInAssembler(void) - - #if defined(powerpc64_HOST_ARCH) - --#if defined(linux_HOST_OS) - static void GNUC3_ATTRIBUTE(used) - StgRunIsImplementedInAssembler(void) - { -@@ -871,10 +870,6 @@ StgRunIsImplementedInAssembler(void) - : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); - } - --#else // linux_HOST_OS --#error Only Linux support for power64 right now. --#endif -- - #endif - - #if defined(powerpc64le_HOST_ARCH) - - - - From f4399ce96514ab58d766de999896780e93c886c6 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:52:31 +0100 Subject: [PATCH] PPC NCG: Make calling convention more general All operating systems except AIX and Darwin follow the ELF specification. --- compiler/nativeGen/PPC/CodeGen.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index efd9591c71..56e3bc280b 100644 --- compiler/nativeGen/PPC/CodeGen.hs +++ compiler/nativeGen/PPC/CodeGen.hs @@ -1565,18 +1565,17 @@ genCCall target dest_regs argsAndHints = panic "genCall: Wrong number of arguments/results for fabs" -- TODO: replace 'Int' by an enum such as 'PPC_64ABI' -data GenCCallPlatform = GCPLinux | GCPDarwin | GCPLinux64ELF !Int | GCPAIX +data GenCCallPlatform = GCP32ELF | GCP64ELF !Int | GCPAIX | GCPDarwin platformToGCP :: Platform -> GenCCallPlatform platformToGCP platform = case platformOS platform of - OSLinux -> case platformArch platform of - ArchPPC -> GCPLinux - ArchPPC_64 ELF_V1 -> GCPLinux64ELF 1 - ArchPPC_64 ELF_V2 -> GCPLinux64ELF 2 - _ -> panic "PPC.CodeGen.platformToGCP: Unknown Linux" OSAIX -> GCPAIX OSDarwin -> GCPDarwin - _ -> panic "PPC.CodeGen.platformToGCP: not defined for this OS" + _ -> case platformArch platform of + ArchPPC -> GCP32ELF + ArchPPC_64 ELF_V1 -> GCP64ELF 1 + ArchPPC_64 ELF_V2 -> GCP64ELF 2 + _ -> panic "platformToGCP: Not PowerPC" genCCall' -- 2.19.2 From fa2128cb78a8b365d822c23b8da19fa14ac23ce3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 28 Dec 2018 23:55:35 +0100 Subject: [PATCH] PPC NCG: Make `stackHeaderSize` more general --- compiler/nativeGen/PPC/Instr.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs index 8eb5e8fa8d..ce421ed4bf 100644 --- compiler/nativeGen/PPC/Instr.hs +++ compiler/nativeGen/PPC/Instr.hs @@ -573,15 +573,14 @@ ppc_mkLoadInstr dflags reg delta slot stackFrameHeaderSize :: DynFlags -> Int stackFrameHeaderSize dflags = case platformOS platform of - OSLinux -> case platformArch platform of - -- header + parameter save area - ArchPPC -> 64 -- TODO: check ABI spec - ArchPPC_64 ELF_V1 -> 48 + 8 * 8 - ArchPPC_64 ELF_V2 -> 32 + 8 * 8 - _ -> panic "PPC.stackFrameHeaderSize: Unknown Linux" OSAIX -> 24 + 8 * 4 OSDarwin -> 64 -- TODO: check ABI spec - _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" + _ -> case platformArch platform of + -- header + parameter save area + ArchPPC -> 64 -- TODO: check ABI spec + ArchPPC_64 ELF_V1 -> 48 + 8 * 8 + ArchPPC_64 ELF_V2 -> 32 + 8 * 8 + _ -> panic "PPC.stackFrameHeaderSize: not defined for this OS" where platform = targetPlatform dflags -- | The maximum number of bytes required to spill a register. PPC32 -- 2.19.2 From 3472824eee7c616aaf755c147ef2c3e4d79fbec4 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:12:48 +0100 Subject: [PATCH] PPC NCG: GOT declaration for all 64-bit ELF systems --- compiler/nativeGen/PIC.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs index 2f300c4614..7be7a860f7 100644 --- compiler/nativeGen/PIC.hs +++ compiler/nativeGen/PIC.hs @@ -527,19 +527,17 @@ pprGotDeclaration _ _ OSAIX ] --- PPC 64 ELF v1 needs a Table Of Contents (TOC) on Linux -pprGotDeclaration _ (ArchPPC_64 ELF_V1) OSLinux +-- PPC 64 ELF v1 needs a Table Of Contents (TOC) +pprGotDeclaration _ (ArchPPC_64 ELF_V1) _ = text ".section \".toc\",\"aw\"" -- In ELF v2 we also need to tell the assembler that we want ABI -- version 2. This would normally be done at the top of the file -- right after a file directive, but I could not figure out how -- to do that. -pprGotDeclaration _ (ArchPPC_64 ELF_V2) OSLinux +pprGotDeclaration _ (ArchPPC_64 ELF_V2) _ = vcat [ text ".abiversion 2", text ".section \".toc\",\"aw\"" ] -pprGotDeclaration _ (ArchPPC_64 _) _ - = panic "pprGotDeclaration: ArchPPC_64 only Linux supported" -- Emit GOT declaration -- Output whatever needs to be output once per .s file. -- 2.19.2 From 749e343ef07aeeb71fe38c432f1b88ad8a6d2a58 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 29 Dec 2018 10:14:12 +0100 Subject: [PATCH] PPC NCG: Register definitions for all 64-bit systems --- compiler/nativeGen/PPC/Regs.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs index 227517be88..7a6d6ed8e5 100644 --- compiler/nativeGen/PPC/Regs.hs +++ compiler/nativeGen/PPC/Regs.hs @@ -229,12 +229,8 @@ allArgRegs = map regSingle [3..10] -- these are the regs which we cannot assume stay alive over a C call. callClobberedRegs :: Platform -> [Reg] -callClobberedRegs platform - = case platformOS platform of - OSAIX -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSDarwin -> map regSingle (0:[2..12] ++ map fReg [0..13]) - OSLinux -> map regSingle (0:[2..13] ++ map fReg [0..13]) - _ -> panic "PPC.Regs.callClobberedRegs: not defined for this architecture" +callClobberedRegs _platform + = map regSingle (0:[2..12] ++ map fReg [0..13]) allMachRegNos :: [RegNo] @@ -265,11 +261,10 @@ allFPArgRegs platform = case platformOS platform of OSAIX -> map (regSingle . fReg) [1..13] OSDarwin -> map (regSingle . fReg) [1..13] - OSLinux -> case platformArch platform of + _ -> case platformArch platform of ArchPPC -> map (regSingle . fReg) [1..8] ArchPPC_64 _ -> map (regSingle . fReg) [1..13] _ -> panic "PPC.Regs.allFPArgRegs: unknown PPC Linux" - _ -> panic "PPC.Regs.allFPArgRegs: not defined for this architecture" fits16Bits :: Integral a => a -> Bool fits16Bits x = x >= -32768 && x < 32768 -- 2.19.2 From 19731a77ed203870f76a53eaf01758efbb5144d3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sun, 13 Jan 2019 15:16:28 +0100 Subject: [PATCH] PPC NCG: Emit type declaration on all ELF systems --- compiler/nativeGen/PPC/Ppr.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs index 2f64d82ee5..82726d90d9 100644 --- compiler/nativeGen/PPC/Ppr.hs +++ compiler/nativeGen/PPC/Ppr.hs @@ -142,9 +142,8 @@ pprGloblDecl lbl pprTypeAndSizeDecl :: CLabel -> SDoc pprTypeAndSizeDecl lbl = sdocWithPlatform $ \platform -> - if platformOS platform == OSLinux && externallyVisibleCLabel lbl - then text ".type " <> - ppr lbl <> text ", @object" + if osElfTarget (platformOS platform) && externallyVisibleCLabel lbl + then text "\t.type " <> ppr lbl <> text ", @object" else empty pprLabel :: CLabel -> SDoc -- 2.19.2 --- compiler/nativeGen/PPC/CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +++ compiler/nativeGen/PPC/CodeGen.hs 2019-01-17 10:03:25.018164000 +0100 @@ -1047,7 +1047,7 @@ genJump tree genJump' :: CmmExpr -> GenCCallPlatform -> NatM InstrBlock -genJump' tree (GCPLinux64ELF 1) +genJump' tree (GCP64ELF 1) = do (target,code) <- getSomeReg tree return (code @@ -1057,7 +1057,7 @@ genJump' tree (GCPLinux64ELF 1) `snocOL` LD II64 r11 (AddrRegImm target (ImmInt 16)) `snocOL` BCTR [] Nothing) -genJump' tree (GCPLinux64ELF 2) +genJump' tree (GCP64ELF 2) = do (target,code) <- getSomeReg tree return (code @@ -1667,7 +1667,7 @@ genCCall' dflags gcp target dest_regs args Right dyn -> do -- implement call through function pointer (dynReg, dynCode) <- getSomeReg dyn case gcp of - GCPLinux64ELF 1 -> return ( dynCode + GCP64ELF 1 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 40)) `snocOL` LD II64 r11 (AddrRegImm dynReg (ImmInt 0)) @@ -1677,7 +1677,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` BCTRL usedRegs `snocOL` LD spFormat toc (AddrRegImm sp (ImmInt 40)) `appOL` codeAfter) - GCPLinux64ELF 2 -> return ( dynCode + GCP64ELF 2 -> return ( dynCode `appOL` codeBefore `snocOL` ST spFormat toc (AddrRegImm sp (ImmInt 24)) `snocOL` MR r12 dynReg @@ -1715,9 +1715,9 @@ genCCall' dflags gcp target dest_regs args initialStackOffset = case gcp of GCPAIX -> 24 GCPDarwin -> 24 - GCPLinux -> 8 - GCPLinux64ELF 1 -> 48 - GCPLinux64ELF 2 -> 32 + GCP32ELF -> 8 + GCP64ELF 1 -> 48 + GCP64ELF 2 -> 32 _ -> panic "genCall': unknown calling convention" -- size of linkage area + size of arguments, in bytes stackDelta finalStack = case gcp of @@ -1727,12 +1727,12 @@ genCCall' dflags gcp target dest_regs args GCPDarwin -> roundTo 16 $ (24 +) $ max 32 $ sum $ map (widthInBytes . typeWidth) argReps - GCPLinux -> roundTo 16 finalStack - GCPLinux64ELF 1 -> + GCP32ELF -> roundTo 16 finalStack + GCP64ELF 1 -> roundTo 16 $ (48 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps - GCPLinux64ELF 2 -> + GCP64ELF 2 -> roundTo 16 $ (32 +) $ max 64 $ sum $ map (roundTo 8 . widthInBytes . typeWidth) argReps @@ -1765,13 +1765,14 @@ genCCall' dflags gcp target dest_regs args -- link editor replaces the NOP instruction with a load of the TOC -- from the stack to restore the TOC. maybeNOP = case gcp of + GCP32ELF -> nilOL -- See Section 3.9.4 of OpenPower ABI GCPAIX -> unitOL NOP -- See Section 3.5.11 of PPC64 ELF v1.9 - GCPLinux64ELF 1 -> unitOL NOP + GCP64ELF 1 -> unitOL NOP -- See Section 2.3.6 of PPC64 ELF v2 - GCPLinux64ELF 2 -> unitOL NOP - _ -> nilOL + GCP64ELF 2 -> unitOL NOP + _ -> panic "maybeNOP: Unknown PowerPC 64-bit ABI" passArguments [] _ _ stackOffset accumCode accumUsed = return (stackOffset, accumCode, accumUsed) passArguments ((arg,arg_ty):args) gprs fprs stackOffset @@ -1806,7 +1807,7 @@ genCCall' dflags gcp target dest_regs args `snocOL` storeWord vr_hi gprs stackOffset `snocOL` storeWord vr_lo (drop 1 gprs) (stackOffset+4)) ((take 2 gprs) ++ accumUsed) - GCPLinux -> + GCP32ELF -> do let stackOffset' = roundTo 8 stackOffset stackCode = accumCode `appOL` code `snocOL` ST II32 vr_hi (AddrRegImm sp (ImmInt stackOffset')) @@ -1826,7 +1827,7 @@ genCCall' dflags gcp target dest_regs args _ -> -- only one or no regs left passArguments args [] fprs (stackOffset'+8) stackCode accumUsed - GCPLinux64ELF _ -> panic "passArguments: 32 bit code" + GCP64ELF _ -> panic "passArguments: 32 bit code" passArguments ((arg,rep):args) gprs fprs stackOffset accumCode accumUsed | reg : _ <- regs = do @@ -1841,9 +1842,9 @@ genCCall' dflags gcp target dest_regs args -- ... so does the PowerOpen ABI. GCPAIX -> stackOffset + stackBytes -- ... the SysV ABI 32-bit doesn't. - GCPLinux -> stackOffset + GCP32ELF -> stackOffset -- ... but SysV ABI 64-bit does. - GCPLinux64ELF _ -> stackOffset + stackBytes + GCP64ELF _ -> stackOffset + stackBytes passArguments args (drop nGprs gprs) (drop nFprs fprs) @@ -1868,14 +1869,14 @@ genCCall' dflags gcp target dest_regs args -- The 32bit PowerOPEN ABI is happy with -- 32bit-alignment as well... stackOffset - GCPLinux + GCP32ELF -- ... the SysV ABI requires 8-byte -- alignment for doubles. | isFloatType rep && typeWidth rep == W64 -> roundTo 8 stackOffset | otherwise -> stackOffset - GCPLinux64ELF _ -> + GCP64ELF _ -> -- Everything on the stack is mapped to -- 8-byte aligned doublewords stackOffset @@ -1886,7 +1887,7 @@ genCCall' dflags gcp target dest_regs args -- "Single precision floating point values -- are mapped to the second word in a single -- doubleword" - GCPLinux64ELF 1 -> stackOffset' + 4 + GCP64ELF 1 -> stackOffset' + 4 _ -> stackOffset' | otherwise = stackOffset' @@ -1925,7 +1926,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (2, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux -> + GCP32ELF -> case cmmTypeFormat rep of II8 -> (1, 0, 4, gprs) II16 -> (1, 0, 4, gprs) @@ -1935,7 +1936,7 @@ genCCall' dflags gcp target dest_regs args FF64 -> (0, 1, 8, fprs) II64 -> panic "genCCall' passArguments II64" FF80 -> panic "genCCall' passArguments FF80" - GCPLinux64ELF _ -> + GCP64ELF _ -> case cmmTypeFormat rep of II8 -> (1, 0, 8, gprs) II16 -> (1, 0, 8, gprs) --- CodeGen.hs.orig 2018-09-16 22:53:54.000000000 +0200 +--- libraries/ghci/GHCi/InfoTable.hsc.orig 2019-07-06 09:00:10.880579000 +0200 ++++ libraries/ghci/GHCi/InfoTable.hsc 2019-07-06 08:59:23.613439000 +0200 +@@ -77,7 +77,7 @@ data Arch = ArchSPARC + | ArchARM + | ArchARM64 + | ArchPPC64 +- | ArchPPC64LE ++ | ArchPPC64_ELFv2 + | ArchUnknown + deriving Show + +@@ -99,8 +99,8 @@ platform = + ArchARM64 + #elif defined(powerpc64_HOST_ARCH) + ArchPPC64 +-#elif defined(powerpc64le_HOST_ARCH) +- ArchPPC64LE ++#elif defined(_CALL_ELF) && (_CALL_ELF == 2) ++ ArchPPC64_ELFv2 + #else + # if defined(TABLES_NEXT_TO_CODE) + # error Unimplemented architecture +@@ -252,7 +252,7 @@ mkJumpToAddr a = case platform of + 0xE96C0010, + 0x4E800420] + +- ArchPPC64LE -> ++ ArchPPC64_ELFv2 -> + -- The ABI requires r12 to point to the function's entry point. + -- We use the medium code model where code resides in the first + -- two gigabytes, so loading a non-negative32 bit address +--- rts/StgCRun.c.orig 2019-04-07 21:39:58.000000000 +0200 ++++ rts/StgCRun.c 2019-07-06 08:57:54.735161000 +0200 +@@ -747,9 +747,8 @@ StgRunIsImplementedInAssembler(void) + Everything is in assembler, so we don't have to deal with GCC... + -------------------------------------------------------------------------- */ + +-#if defined(powerpc64_HOST_ARCH) ++#if defined(ELF_V1) + +-#if defined(linux_HOST_OS) + static void GNUC3_ATTRIBUTE(used) + StgRunIsImplementedInAssembler(void) + { +@@ -871,13 +870,9 @@ StgRunIsImplementedInAssembler(void) + : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); + } + +-#else // linux_HOST_OS +-#error Only Linux support for power64 right now. + #endif + +-#endif +- +-#if defined(powerpc64le_HOST_ARCH) ++#if defined(ELF_V2) + /* ----------------------------------------------------------------------------- + PowerPC 64 little endian architecture + +--- rts/StgCRunAsm.S.orig 2018-06-12 22:33:31.000000000 +0200 ++++ rts/StgCRunAsm.S 2019-07-06 13:29:26.837367000 +0200 +@@ -1,8 +1,7 @@ + #include "ghcconfig.h" + #include "rts/Constants.h" + +-#if defined(powerpc64le_HOST_ARCH) +-# ifdef linux_HOST_OS ++#if defined(_CALL_ELF) && (_CALL_ELF == 2) + # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304 + .file "StgCRun.c" + .abiversion 2 +@@ -13,6 +12,8 @@ + .hidden StgRun + .type StgRun,@function + StgRun: ++ addis %r2, %r12, .TOC.-StgRun@ha ++ addi %r2, %r2, .TOC.-StgRun@l + .localentry StgRun,.-StgRun + mflr 0 + mr 5, 1 +@@ -108,9 +109,6 @@ StgReturn: + blr + + .section .note.GNU-stack,"",@progbits +-# else // linux_HOST_OS +-# error Only Linux support for power64 little endian right now. +-# endif + + #elif defined(powerpc_HOST_ARCH) + # if defined(aix_HOST_OS)