summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorTamar Christina <tamar@zhox.com>2020-06-24 22:25:41 +0100
committerBen Gamari <ben@smart-cactus.org>2020-07-15 16:41:04 -0400
commitded58a037774147073366ff2dfdc8965e02a96e5 (patch)
treed858677e5f803726329c9e9f5572e6a56ac92b5c /rts
parent3bd415721672da9aa88c4528df8ba15bc616f3be (diff)
downloadhaskell-ded58a037774147073366ff2dfdc8965e02a96e5.tar.gz
winio: update lockfile signature and remove mistaken symbol in rts.
Diffstat (limited to 'rts')
-rw-r--r--rts/FileLock.c4
-rw-r--r--rts/package.conf.in2
-rw-r--r--rts/rts.cabal.in2
-rw-r--r--rts/win32/libHSbase.def1
4 files changed, 2 insertions, 7 deletions
diff --git a/rts/FileLock.c b/rts/FileLock.c
index 34f4046b38..4509de1a42 100644
--- a/rts/FileLock.c
+++ b/rts/FileLock.c
@@ -76,7 +76,7 @@ freeFileLocking(void)
}
int
-lockFile(StgWord id, StgWord64 dev, StgWord64 ino, int for_writing)
+lockFile(StgWord64 id, StgWord64 dev, StgWord64 ino, int for_writing)
{
Lock key, *lock;
@@ -113,7 +113,7 @@ lockFile(StgWord id, StgWord64 dev, StgWord64 ino, int for_writing)
}
int
-unlockFile(StgWord id)
+unlockFile(StgWord64 id)
{
Lock *lock;
diff --git a/rts/package.conf.in b/rts/package.conf.in
index d59d0ce641..8b7390865b 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -98,7 +98,6 @@ ld-options:
, "-Wl,-u,_base_GHCziIOziException_cannotCompactPinned_closure"
, "-Wl,-u,_base_GHCziIOziException_cannotCompactMutable_closure"
, "-Wl,-u,_base_GHCziIOPort_doubleReadException_closure"
- , "-Wl,-u,_base_ControlziExceptionziBase_absentSumFieldError_closure"
, "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure"
, "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure"
, "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure"
@@ -213,7 +212,6 @@ ld-options:
, "-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure"
, "-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure"
, "-Wl,-u,base_GHCziIOPort_doubleReadException_closure"
- , "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure"
, "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure"
, "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure"
, "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure"
diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
index a890d3dc1d..1a1eb30611 100644
--- a/rts/rts.cabal.in
+++ b/rts/rts.cabal.in
@@ -228,7 +228,6 @@ library
"-Wl,-u,_base_GHCziIOziException_cannotCompactPinned_closure"
"-Wl,-u,_base_GHCziIOziException_cannotCompactMutable_closure"
"-Wl,-u,_base_GHCziIOPort_doubleReadException_closure"
- "-Wl,-u,_base_ControlziExceptionziBase_absentSumFieldError_closure"
"-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure"
"-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure"
"-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure"
@@ -310,7 +309,6 @@ library
"-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure"
"-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure"
"-Wl,-u,base_GHCziIOPort_doubleReadException_closure"
- "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure"
"-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure"
"-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure"
"-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure"
diff --git a/rts/win32/libHSbase.def b/rts/win32/libHSbase.def
index 733fffb5df..cb9c32729e 100644
--- a/rts/win32/libHSbase.def
+++ b/rts/win32/libHSbase.def
@@ -44,7 +44,6 @@ EXPORTS
base_GHCziIOziException_cannotCompactPinned_closure
base_GHCziIOziException_cannotCompactMutable_closure
base_GHCziIOPort_doubleReadException_closure
- base_ControlziExceptionziBase_absentSumFieldError_closure
base_ControlziExceptionziBase_nonTermination_closure
base_ControlziExceptionziBase_nestedAtomically_closure
base_GHCziEventziThread_blockedOnBadFD_closure