[Git][ghc/ghc][master] configure: Rip out Solaris dyld check

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
de5830d0 by Ben Gamari at 2023-07-04T22:03:59-04:00
configure: Rip out Solaris dyld check

Solaris 11 was released over a decade ago and, moreover, I doubt we have
any Solaris users

- - - - -


5 changed files:

- configure.ac
- hadrian/cfg/system.config.in
- hadrian/src/Oracles/Flag.hs
- m4/fp_hs_cpp_cmd_with_args.m4
- mk/project.mk.in


Changes:

=====================================
configure.ac
=====================================
@@ -298,23 +298,6 @@ then
     exit 1
 fi
 
-# Testing if we shall enable shared libs support on Solaris.
-# Anything older than SunOS 5.11 aka Solaris 11 (Express) is broken.
-
-SOLARIS_BROKEN_SHLD=NO
-
-case $host in
-     i386-*-solaris2)
-     # here we go with the test
-     MINOR=`uname -r|cut -d '.' -f 2-`
-     if test "$MINOR" -lt "11"; then
-         SOLARIS_BROKEN_SHLD=YES
-     fi
-     ;;
-esac
-
-AC_SUBST(SOLARIS_BROKEN_SHLD)
-
 dnl ** Do an unregisterised build?
 dnl --------------------------------------------------------------
 


=====================================
hadrian/cfg/system.config.in
=====================================
@@ -51,7 +51,6 @@ hs-cpp-args               = @HaskellCPPArgs@
 # Build options:
 #===============
 
-solaris-broken-shld  = @SOLARIS_BROKEN_SHLD@
 ghc-unregisterised   = @Unregisterised@
 tables-next-to-code  = @TablesNextToCode@
 use-libffi-for-adjustors = @UseLibffiForAdjustors@


=====================================
hadrian/src/Oracles/Flag.hs
=====================================
@@ -28,7 +28,6 @@ data Flag = ArSupportsAtFile
           | GmpInTree
           | GmpFrameworkPref
           | LeadingUnderscore
-          | SolarisBrokenShld
           | UseSystemFfi
           | BootstrapThreadedRts
           | BootstrapEventLoggingRts
@@ -60,7 +59,6 @@ flag f = do
             GmpInTree            -> "intree-gmp"
             GmpFrameworkPref     -> "gmp-framework-preferred"
             LeadingUnderscore    -> "leading-underscore"
-            SolarisBrokenShld    -> "solaris-broken-shld"
             UseSystemFfi         -> "use-system-ffi"
             BootstrapThreadedRts -> "bootstrap-threaded-rts"
             BootstrapEventLoggingRts -> "bootstrap-event-logging-rts"
@@ -105,8 +103,7 @@ platformSupportsSharedLibs = do
     ppc_linux     <- anyTargetPlatform [ "powerpc-unknown-linux" ]
     solaris       <- anyTargetPlatform [ "i386-unknown-solaris2" ]
     javascript    <- anyTargetArch     [ "javascript" ]
-    solarisBroken <- flag SolarisBrokenShld
-    return $ not (windows || wasm || javascript || ppc_linux || solaris && solarisBroken)
+    return $ not (windows || wasm || javascript || ppc_linux || solaris)
 
 -- | Does the target support threaded RTS?
 targetSupportsThreadedRts :: Action Bool


=====================================
m4/fp_hs_cpp_cmd_with_args.m4
=====================================
@@ -25,36 +25,6 @@ AC_ARG_WITH(hs-cpp,
     # command (no flags), and AC_PROG_CPP defines CPP as "/usr/bin/gcc -E".
     HS_CPP_CMD=$CC
 
-    SOLARIS_GCC_CPP_BROKEN=NO
-    SOLARIS_FOUND_GOOD_CPP=NO
-    case $host in
-        i386-*-solaris2)
-        GCC_MAJOR_MINOR=`$CC --version|grep "gcc (GCC)"|cut -d ' ' -f 3-3|cut -d '.' -f 1-2`
-        if test "$GCC_MAJOR_MINOR" != "3.4"; then
-          # this is not 3.4.x release so with broken CPP
-          SOLARIS_GCC_CPP_BROKEN=YES
-        fi
-        ;;
-    esac
-
-    if test "$SOLARIS_GCC_CPP_BROKEN" = "YES"; then
-      # let's try to find if GNU C 3.4.x is installed
-      if test -x /usr/sfw/bin/gcc; then
-        # something executable is in expected path so let's
-        # see if it's really GNU C
-        NEW_GCC_MAJOR_MINOR=`/usr/sfw/bin/gcc --version|grep "gcc (GCC)"|cut -d ' ' -f 3-3|cut -d '.' -f 1-2`
-        if test "$NEW_GCC_MAJOR_MINOR" = "3.4"; then
-          # this is GNU C 3.4.x which provides non-broken CPP on Solaris
-          # let's use it as CPP then.
-          HS_CPP_CMD=/usr/sfw/bin/gcc
-          SOLARIS_FOUND_GOOD_CPP=YES
-        fi
-      fi
-      if test "$SOLARIS_FOUND_GOOD_CPP" = "NO"; then
-        AC_MSG_WARN([Your GNU C provides broken CPP and you do not have GNU C 3.4.x installed.])
-        AC_MSG_WARN([Please install GNU C 3.4.x to solve this issue. It will be used as CPP only.])
-      fi
-    fi
 ]
 )
 


=====================================
mk/project.mk.in
=====================================
@@ -156,10 +156,6 @@ else
 Windows_Target=NO
 endif
 
-# In case of Solaris OS, does it provide broken shared libs
-# linker or not?
-SOLARIS_BROKEN_SHLD=@SOLARIS_BROKEN_SHLD@
-
 # Is the stage0 compiler affected by Bug #9439?
 GHC_LLVM_AFFECTED_BY_9439 = @GHC_LLVM_AFFECTED_BY_9439@
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/de5830d0d3983b551d7c9abbcc4e5d13155a2c8c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/de5830d0d3983b551d7c9abbcc4e5d13155a2c8c
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230704/23fc0249/attachment-0001.html>