[commit: ghc] ghc-8.0: Fix GHCi perf-llvm build on x86_64 (676efb9)
git at git.haskell.org
git at git.haskell.org
Mon Sep 5 23:12:10 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/676efb9f00d14c7f4bad7160d270c1292dd9b436/ghc
>---------------------------------------------------------------
commit 676efb9f00d14c7f4bad7160d270c1292dd9b436
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date: Sun Aug 14 07:23:35 2016 +1000
Fix GHCi perf-llvm build on x86_64
With BuildFlavour set to `perf-llvm`, GHCi would fail as soon as it
was run with:
ghc-stage2: .../ghc-prim/dist-install/build/HSghc-prim-0.5.0.0.o:
unknown symbol `__udivti3'
ghc-stage2: unable to load package `ghc-prim-0.5.0.0'
Fix this by adding `__udivti3` and `__umodti3` to RtsSymbols.c.
Test Plan: Validate
Reviewers: simonmar, austin, bgamari, Phyx, trofi
Reviewed By: Phyx, trofi
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2449
GHC Trac Issues: #11981
(cherry picked from commit bd0c31063551744d00796219174739216c398da5)
>---------------------------------------------------------------
676efb9f00d14c7f4bad7160d270c1292dd9b436
rts/RtsSymbols.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index fdacae6..fec5cfc 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -868,6 +868,10 @@
SymI_NeedsProto(__ashrdi3) \
SymI_NeedsProto(__lshrdi3) \
SymI_NeedsProto(__fixunsdfdi)
+#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
+#define RTS_LIBGCC_SYMBOLS \
+ SymI_NeedsProto(__udivti3) \
+ SymI_NeedsProto(__umodti3)
#else
#define RTS_LIBGCC_SYMBOLS
#endif
More information about the ghc-commits
mailing list