[commit: ghc] master: Remove a bitrotted hack for OpenBSD and NetBSD regarding the dyn way. (ae3dcaf)

Ian Lynagh igloo at earth.li
Sun Mar 17 03:20:17 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/ae3dcaf5884028e4e29a45f724d2d3f5c92a1caf

>---------------------------------------------------------------

commit ae3dcaf5884028e4e29a45f724d2d3f5c92a1caf
Author: PHO <pho at cielonegro.org>
Date:   Thu Mar 14 16:13:45 2013 +0900

    Remove a bitrotted hack for OpenBSD and NetBSD regarding the dyn way.
    
    On OpenBSD and NetBSD, we were accidentally passing "-optl-pthread" to
    the gcc to build dynamic libraries because of a bitrotted hack for
    those OSes, which resulted in a weird situation where every dynamic
    library is named "ptl-pthread" and placed at "$(TOP)".
    
    The hack in question were to work around a linkage problem with
    libHSffi, but we no longer build it and just use libffi these days so
    the hack can safely be removed.

>---------------------------------------------------------------

 compiler/main/DynFlags.hs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index c021355..3705846 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1121,16 +1121,8 @@ wayOptl platform WayThreaded =
         OSOpenBSD  -> ["-pthread"]
         OSNetBSD   -> ["-pthread"]
         _          -> []
-wayOptl _ WayDebug = []
-wayOptl platform WayDyn =
-        case platformOS platform of
-        OSOpenBSD -> -- Without this, linking the shared libHSffi fails
-                     -- because it uses pthread mutexes.
-                     ["-optl-pthread"]
-        OSNetBSD -> -- Without this, linking the shared libHSffi fails
-                    -- because it uses pthread mutexes.
-                    ["-optl-pthread"]
-        _ -> []
+wayOptl _ WayDebug      = []
+wayOptl _ WayDyn        = []
 wayOptl _ WayProf       = []
 wayOptl _ WayEventLog   = []
 wayOptl _ WayPar        = ["-L${PVM_ROOT}/lib/${PVM_ARCH}",





More information about the ghc-commits mailing list