mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

lang/ghc: Update to 8.6.4 and bump PORTREVISIONs for Haskell ports.

Browse Source 
While there, fix build with DOCS=off.

Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D20464
This commit is contained in:
Gleb Popov 2019-06-02 09:02:21 +00:00
parent 062be3332d
commit 55deb88353
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=503292
34 changed files with 606 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/hs-cabal-install/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= cabal-install
PORTVERSION= 2.4.0.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-data-default-class/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= data-default-class
PORTVERSION= 0.1.2.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-data-default-instances-base/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= data-default-instances-base
PORTVERSION= 0.1.0.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-data-default-instances-containers/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= data-default-instances-containers
PORTVERSION= 0.0.1
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-data-default-instances-dlist/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= data-default-instances-dlist
PORTVERSION= 0.0.1
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-data-default-instances-old-locale/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= data-default-instances-old-locale
PORTVERSION= 0.0.1
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-data-default/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= data-default
PORTVERSION= 0.7.1.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-dlist/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= dlist
PORTVERSION= 0.8.0.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-extensible-exceptions/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= extensible-exceptions
PORTVERSION= 0.1.1.4
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-hashable/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= hashable
PORTVERSION= 1.2.7.0
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= devel haskell

2
devel/hs-mtl/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.2.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-old-locale/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= old-locale
PORTVERSION= 1.0.0.7
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-old-time/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= old-time
PORTVERSION= 1.1.0.3
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-random/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= random
PORTVERSION= 1.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-setlocale/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= setlocale
PORTVERSION= 1.0.0.8
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-transformers-compat/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= transformers-compat
PORTVERSION= 0.5.1.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-unordered-containers/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= unordered-containers
PORTVERSION= 0.2.9.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

2
devel/hs-utf8-string/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= utf8-string
PORTVERSION= 1.0.1.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org

9
lang/ghc/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= ghc
PORTVERSION= ${GHC_VERSION}
PORTREVISION= 1
CATEGORIES= lang haskell
MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
LOCAL/arrowd/:boot \
@ -77,7 +76,7 @@ PROFILE_SUB_LIST= WITH_PROFILE="YES"
PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO"
GHC_VERSION?= ${GHC_VERSION_DEFAULT}
GHC_VERSION_DEFAULT= 8.6.3
GHC_VERSION_DEFAULT= 8.6.4
GHC_VERSION_MAJOR= ${GHC_VERSION:S/./ /g:[1]}
GHC_VERSION_MINOR= ${GHC_VERSION:S/./ /g:[2]}
@ -124,9 +123,11 @@ _EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \
${GHC_LIBDIR}/bin/hsc2hs \
${GHC_LIBDIR}/bin/runghc \
${GHC_LIBDIR}/bin/ghc \
${GHC_LIBDIR}/bin/hp2ps \
${GHC_LIBDIR}/bin/haddock
${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

2
lang/ghc/bsd.cabal.options.mk
View File

@ -18,7 +18,7 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
GHC_VERSION?= 8.6.3
GHC_VERSION?= 8.6.4
.if defined(OPTIONSMKINCLUDED)
IGNORE?= options fail: bsd.cabal.mk already includes bsd.options.mk

4
lang/ghc/distinfo
View File

@ -1,4 +1,6 @@
TIMESTAMP = 1541010523
TIMESTAMP = 1559062248
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

20
lang/ghc/files863/build.mk.in Normal file
View File

@ -0,0 +1,20 @@
docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
mandir = %%PREFIX%%/man
infodir = %%PREFIX%%/info
DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
BUILD_PROF_LIBS = %%WITH_PROFILE%%
HADDOCK_DOCS = %%WITH_DOCS%%
HSCOLOUR_SRCS = %%WITH_DOCS%%
INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
# disable xelatex: PR 231438
BUILD_SPHINX_PDF = NO
BSD_PATH_TO_HSC2HS = %%HSC2HS%%
SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
SRC_CC_OPTS += %%CFLAGS%%
EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib
EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib
EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include
EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%%
V = 0

16
lang/ghc/files863/extra-patch-aclocal.m4 Normal file
View File

@ -0,0 +1,16 @@
--- aclocal.m4.orig 2018-03-25 21:22:32 UTC
+++ aclocal.m4
@@ -2361,13 +2378,6 @@ AC_DEFUN([FIND_LD],[
[enable_ld_override=yes])
find_ld() {
- # Make sure the user didn't specify LD manually.
- if test "z$LD" != "z"; then
- AC_CHECK_TARGET_TOOL([LD], [ld])
- LD_NO_GOLD=$LD
- return
- fi
-
# Manually iterate over possible names since we want to ensure that, e.g.,
# if ld.lld is installed but gcc doesn't support -fuse-ld=lld, that we
# then still try ld.gold and -fuse-ld=gold.

12
lang/ghc/files863/patch-configure.ac Normal file
View File

@ -0,0 +1,12 @@
--- configure.ac.orig 2018-04-17 19:30:22 UTC
+++ configure.ac
@@ -447,6 +447,9 @@ XCODE_VERSION()
dnl ** Building a cross compiler?
dnl --------------------------------------------------------------
CrossCompiling=NO
+
+build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/armv[[67]]-/arm-/g; s/-freebsd.*$/-freebsd/g'`
+
# If 'host' and 'target' differ, then this means we are building a cross-compiler.
if test "$TargetPlatform" != "$HostPlatform" ; then
CrossCompiling=YES

20
lang/ghc/files863/patch-ghc.mk Normal file
View File

@ -0,0 +1,20 @@
--- ghc.mk.orig 2018-09-16 20:53:54 UTC
+++ ghc.mk
@@ -96,6 +96,7 @@ endif
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
else ifeq "$(MAKE_RESTARTS)" "1"
+else ifeq "$(MAKE_RESTARTS)" "2"
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
endif
@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell
PACKAGES_STAGE1 += ghc-compact
PACKAGES_STAGE1 += ghc-heap
-ifeq "$(HADDOCK_DOCS)" "YES"
PACKAGES_STAGE1 += xhtml
-endif
ifeq "$(WITH_TERMINFO)" "YES"
PACKAGES_STAGE1 += terminfo

39
lang/ghc/files863/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs Normal file
View File

@ -0,0 +1,39 @@
--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-11-28 16:40:34 UTC
+++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
@@ -59,6 +59,8 @@ import Distribution.Compat.Exception
import Distribution.Verbosity
import Distribution.Version
+import System.FilePath (takeDirectory)
+
import qualified Data.Map as Map
-- ------------------------------------------------------------
@@ -265,11 +267,13 @@ alexProgram = (simpleProgram "alex") {
gccProgram :: Program
gccProgram = (simpleProgram "gcc") {
- programFindVersion = findProgramVersion "-dumpversion" id
- }
+ programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
+}
arProgram :: Program
-arProgram = simpleProgram "ar"
+arProgram = (simpleProgram "ar") {
+ programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%"
+}
stripProgram :: Program
stripProgram = (simpleProgram "strip") {
@@ -337,7 +341,9 @@ greencardProgram :: Program
greencardProgram = simpleProgram "greencard"
ldProgram :: Program
-ldProgram = simpleProgram "ld"
+ldProgram = (simpleProgram "ld") {
+ programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%"
+ }
tarProgram :: Program
tarProgram = (simpleProgram "tar") {

411
lang/ghc/files863/patch-ppc64 Normal file
View File

@ -0,0 +1,411 @@
--- 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 <ptrommler@acm.org>
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 <ptrommler@acm.org>
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 <ptrommler@acm.org>
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 <ptrommler@acm.org>
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 <ptrommler@acm.org>
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 <ptrommler@acm.org>
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

55
lang/ghc/files863/wrap.c Normal file
View File

@ -0,0 +1,55 @@
/* -*- ugly-hack-mode -*- */
/* $FreeBSD$ */
#include <sys/stat.h>
struct old_dirent;
struct old_stat;
__asm(".symver old_readdir_r, readdir_r@FBSD_1.0");
int old_readdir_r(void *dirp, struct old_dirent *entry,
struct old_dirent **result);
__asm(".symver old_stat, stat@FBSD_1.0");
int old_stat(const char * restrict path, struct old_stat * restrict sb);
__asm(".symver old_lstat, lstat@FBSD_1.0");
int old_lstat(const char * restrict path, struct old_stat * restrict sb);
__asm(".symver old_fstat, fstat@FBSD_1.0");
int old_fstat(int fd, struct old_stat *sb);
__asm(".symver old_mknod, mknod@FBSD_1.0");
int old_mknod(const char *path, mode_t mode, uint32_t dev);
int
__wrap_readdir_r(void *dirp, struct old_dirent *entry,
struct old_dirent **result)
{
return (old_readdir_r(dirp, entry, result));
}
int
__wrap_stat(const char * restrict path, struct old_stat * restrict sb)
{
return (old_stat(path, sb));
}
int
__wrap_lstat(const char * restrict path, struct old_stat * restrict sb)
{
return (old_lstat(path, sb));
}
int
__wrap_fstat(int fd, struct old_stat *sb)
{
return (old_fstat(fd, sb));
}
int
__wrap_mknod(const char *path, mode_t mode, uint32_t dev)
{
return (old_mknod(path, mode, dev));
}

2
lang/ghc/pkg-plist
View File

@ -3,7 +3,7 @@ bin/ghci
bin/ghc-pkg
bin/runhaskell
bin/runghc
bin/haddock-ghc-%%GHC_VERSION%%
%%DOCS%%bin/haddock-ghc-%%GHC_VERSION%%
bin/hp2ps
bin/hpc
bin/hsc2hs

2
math/hs-semigroups/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= semigroups
PORTVERSION= 0.18.4
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org

2
x11-wm/hs-xmonad-contrib/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.15
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org

2
x11-wm/hs-xmonad/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.15
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org

2
x11/hs-X11-xft/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
PORTREVISION= 20
PORTREVISION= 21
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org

2
x11/hs-X11/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= X11
PORTVERSION= 1.8
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org