minimal stage1

.gitignore

@@ -202,6 +202,7 @@ _darcs/
 /testsuite*.xml
 /testlog*
 /utils/ghc-iserv/ghc-iserv.cabal
+/utils/iserv/iserv.cabal
 /utils/iserv-proxy/iserv-proxy.cabal
 /utils/remote-iserv/remote-iserv.cabal
 /utils/mkUserGuidePart/mkUserGuidePart.cabal

cabal.project.stage1

@@ -20,7 +20,6 @@ packages:
   -- Internal libraries
   libraries/ghc-boot
   libraries/ghc-boot-th-next
-  libraries/ghci
   libraries/ghc-platform
   libraries/libffi-clib
 
@@ -67,9 +66,14 @@ package *
 
 package ghc
   flags: +bootstrap
-
-package ghci
-  flags: +bootstrap
+         +x86-ncg +aarch64-ncg
+         -ppc-ncg -riscv64-ncg -loongarch64-ncg
+         -js-backend -wasm-backend
+         +llvm-backend
+         -interpreter -dynamic-linker
+
+package ghc-bin
+  flags: -frontend-plugins
 
 package ghc-boot
   flags: +bootstrap

compiler/GHC.hs

@@ -39,8 +39,10 @@ module GHC (
         setUnitDynFlags,
         getProgramDynFlags, setProgramDynFlags,
         setProgramHUG, setProgramHUG_,
+#if defined(HAVE_INTERPRETER)
         getInteractiveDynFlags, setInteractiveDynFlags,
         normaliseInteractiveDynFlags, initialiseInteractiveDynFlags,
+#endif
         interpretPackageEnv,
 
         -- * Logging
@@ -61,7 +63,10 @@ module GHC (
 
         -- * Loading\/compiling the program
         depanal, depanalE,
-        load, loadWithCache, LoadHowMuch(..), InteractiveImport(..),
+        load, loadWithCache, LoadHowMuch(..),
+#if defined(HAVE_INTERPRETER)
+        InteractiveImport(..),
+#endif
         SuccessFlag(..), succeeded, failed,
         defaultWarnErrLogger, WarnErrLogger,
         workingDirectoryChanged,
@@ -142,7 +147,7 @@ module GHC (
         NamePprCtx, alwaysQualify,
 
         -- * Interactive evaluation
-
+#if defined(HAVE_INTERPRETER)
         -- ** Executing statements
         execStmt, execStmt', ExecOptions(..), execOptions, ExecResult(..),
         resumeExec,
@@ -153,7 +158,9 @@ module GHC (
         -- ** Get/set the current context
         parseImportDecl,
         setContext, getContext,
+#if defined(HAVE_INTERPRETER)
         setGHCiMonad, getGHCiMonad,
+#endif
 
         -- ** Inspecting the current context
         getBindings, getInsts, getNamePprCtx,
@@ -164,7 +171,9 @@ module GHC (
         isModuleTrusted, moduleTrustReqs,
         getNamesInScope,
         getRdrNamesInScope,
+#if defined(HAVE_INTERPRETER)
         getGRE,
+#endif
         moduleIsInterpreted,
         getInfo,
         showModule,
@@ -191,8 +200,10 @@ module GHC (
         -- ** Other
         runTcInteractive,   -- Desired by some clients (#8878)
         isStmt, hasImport, isImport, isDecl,
+#endif
 
         -- ** The debugger
+#if defined(HAVE_INTERPRETER)
         SingleStep(..),
         Resume(..),
         History(historyBreakpointId, historyEnclosingDecls),
@@ -206,6 +217,7 @@ module GHC (
         GHC.Runtime.Eval.back,
         GHC.Runtime.Eval.forward,
         GHC.Runtime.Eval.setupBreakpoint,
+#endif
 
         -- * Abstract syntax elements
 
@@ -270,8 +282,10 @@ module GHC (
         Kind,
         PredType,
         ThetaType, pprForAll, pprThetaArrowTy,
+#if defined(HAVE_INTERPRETER)
         parseInstanceHead,
         getInstancesForType,
+#endif
 
         -- ** Entities
         TyThing(..),
@@ -357,6 +371,8 @@ import GHC.Driver.Hooks
 import GHC.Driver.Monad
 import GHC.Driver.Ppr
 
+#if defined(HAVE_INTERPRETER)
+import GHC.Driver.Config.StgToJS (initStgToJSConfig)
 import GHC.ByteCode.Types
 import GHC.Runtime.Loader
 import GHC.Runtime.Eval
@@ -365,6 +381,7 @@ import GHC.Runtime.Interpreter.Init
 import GHC.Driver.Config.Interpreter
 import GHC.Runtime.Context
 import GHCi.RemoteTypes
+#endif
 
 import qualified GHC.Parser as Parser
 import GHC.Parser.Lexer
@@ -575,7 +592,9 @@ withCleanupSession ghc = ghc `MC.finally` cleanup
           unless (gopt Opt_KeepTmpFiles dflags) $ do
             cleanTempFiles logger tmpfs
             cleanTempDirs logger tmpfs
+#if defined(HAVE_INTERPRETER)
           traverse_ stopInterp (hsc_interp hsc_env)
+#endif
           --  exceptions will be blocked while we clean the temporary files,
           -- so there shouldn't be any difficulty if we receive further
           -- signals.
@@ -709,6 +728,8 @@ setTopSessionDynFlags :: GhcMonad m => DynFlags -> m ()
 setTopSessionDynFlags dflags = do
   hsc_env <- getSession
   logger  <- getLogger
+
+#if defined(HAVE_INTERPRETER)
   let platform = targetPlatform dflags
   let unit_env = hsc_unit_env hsc_env
   let tmpfs = hsc_tmpfs hsc_env
@@ -719,11 +740,19 @@ setTopSessionDynFlags dflags = do
                       }
 
   interp <- liftIO $ initInterpreter tmpfs logger platform finder_cache unit_env interp_opts
+#else
+  -- No interpreter support (HAVE_INTERPRETER not defined)
+  let interp = Nothing
+#endif
 
   modifySession $ \h -> hscSetFlags dflags
+#if defined(HAVE_INTERPRETER)
                         h{ hsc_IC = (hsc_IC h){ ic_dflags = dflags }
                          , hsc_interp = hsc_interp h <|> interp
                          }
+#else
+                        h{ hsc_interp = hsc_interp h <|> interp }
+#endif
 
   invalidateModSummaryCache
 
@@ -923,6 +952,7 @@ getProgramDynFlags = getSessionDynFlags
 -- Note: this cannot be used for changes to packages.  Use
 -- 'setSessionDynFlags', or 'setProgramDynFlags' and then copy the
 -- 'unitState' into the interactive @DynFlags@.
+#if defined(HAVE_INTERPRETER)
 setInteractiveDynFlags :: GhcMonad m => DynFlags -> m ()
 setInteractiveDynFlags dflags = do
   logger <- getLogger
@@ -932,6 +962,7 @@ setInteractiveDynFlags dflags = do
 -- | Get the 'DynFlags' used to evaluate interactive expressions.
 getInteractiveDynFlags :: GhcMonad m => m DynFlags
 getInteractiveDynFlags = withSession $ \h -> return (ic_dflags (hsc_IC h))
+#endif
 
 
 parseDynamicFlags
@@ -1035,10 +1066,12 @@ normalise_hyp fp
 -- | Normalise the 'DynFlags' for us in an interactive context.
 --
 -- Makes sure unsupported Flags and other incosistencies are reported and removed.
+#if defined(HAVE_INTERPRETER)
 normaliseInteractiveDynFlags :: MonadIO m => Logger -> DynFlags -> m DynFlags
 normaliseInteractiveDynFlags logger dflags = do
   dflags' <- checkNewDynFlags logger dflags
   checkNewInteractiveDynFlags logger dflags'
+#endif
 
 -- | Given a set of normalised 'DynFlags' (see 'normaliseInteractiveDynFlags')
 -- for the interactive context, initialize the 'InteractiveContext'.
@@ -1049,6 +1082,7 @@ initialiseInteractiveDynFlags :: GhcMonad m => DynFlags -> HscEnv -> m HscEnv
 initialiseInteractiveDynFlags dflags hsc_env0 = do
   let ic0 = hsc_IC hsc_env0
 
+#if defined(HAVE_INTERPRETER)
   -- Initialise (load) plugins in the interactive environment with the new
   -- DynFlags
   plugin_env <- liftIO $ initializePlugins $ mkInteractiveHscEnv $
@@ -1061,6 +1095,10 @@ initialiseInteractiveDynFlags dflags hsc_env0 = do
                   , ic_dflags  = hsc_dflags  plugin_env
                   }
               }
+#else
+  -- No plugin support (HAVE_INTERPRETER not defined)
+  return hsc_env0
+#endif
 
 -- | Checks the set of new DynFlags for possibly erroneous option
 -- combinations when invoking 'setSessionDynFlags' and friends, and if
@@ -1498,8 +1536,10 @@ findGlobalAnns deserialize target = withSession $ \hsc_env -> do
     return (findAnns deserialize ann_env target)
 
 -- | get the GlobalRdrEnv for a session
+#if defined(HAVE_INTERPRETER)
 getGRE :: GhcMonad m => m GlobalRdrEnv
 getGRE = withSession $ \hsc_env-> return $ icReaderEnv (hsc_IC hsc_env)
+#endif
 
 -- | Retrieve all type and family instances in the environment, indexed
 -- by 'Name'. Each name's lists will contain every instance in which that name
@@ -1794,6 +1834,7 @@ moduleTrustReqs :: GhcMonad m => Module -> m (Bool, Set UnitId)
 moduleTrustReqs m = withSession $ \hsc_env ->
     liftIO $ hscGetSafe hsc_env m noSrcSpan
 
+#if defined(HAVE_INTERPRETER)
 -- | Set the monad GHCi lifts user statements into.
 --
 -- Checks that a type (in string form) is an instance of the
@@ -1809,7 +1850,9 @@ setGHCiMonad name = withSession $ \hsc_env -> do
 -- | Get the monad GHCi lifts user statements into.
 getGHCiMonad :: GhcMonad m => m Name
 getGHCiMonad = fmap (ic_monad . hsc_IC) getSession
+#endif
 
+#if defined(HAVE_INTERPRETER)
 getHistorySpan :: GhcMonad m => History -> m SrcSpan
 getHistorySpan h = withSession $ \hsc_env -> liftIO $ GHC.Runtime.Eval.getHistorySpan (hsc_HUG hsc_env) h
 
@@ -1824,6 +1867,7 @@ obtainTermFromId :: GhcMonad m
                  -> m Term
 obtainTermFromId bound force id = withSession $ \hsc_env ->
     liftIO $ GHC.Runtime.Eval.obtainTermFromId hsc_env bound force id
+#endif
 
 
 -- | Returns the 'TyThing' for a 'Name'.  The 'Name' may refer to any

compiler/GHC/ByteCode/Linker.hs

@@ -8,6 +8,8 @@
 --
 --  (c) The University of Glasgow 2002-2006
 --
+-- NOTE: This module is only compiled when flag(interpreter) is enabled
+-- (see ghc.cabal.in). No CPP guards needed.
 
 -- | Bytecode assembler and linker
 module GHC.ByteCode.Linker
@@ -238,3 +240,4 @@ primopToCLabel primop suffix = concat
     , zString (zEncodeFS (occNameFS (primOpOcc primop)))
     , '_':suffix
     ]
+

compiler/GHC/CmmToAsm.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 -- -----------------------------------------------------------------------------
 --
 -- (c) The University of Glasgow 1993-2004
@@ -27,7 +29,7 @@
 -- possible.
 --
 -- The machine-dependent bits are generally contained under
---  GHC/CmmToAsm/<Arch>/* and generally breaks down as follows:
+--  GHC/CmmToAsm/<Arch> and generally breaks down as follows:
 --
 --   * "Regs": Everything about the target platform's machine
 --     registers (and immediate operands, and addresses, which tend to
@@ -63,12 +65,25 @@ where
 
 import GHC.Prelude hiding (head)
 
+#if defined(HAVE_X86_NCG)
 import qualified GHC.CmmToAsm.X86   as X86
-import qualified GHC.CmmToAsm.PPC   as PPC
+#endif
+#if defined(HAVE_AARCH64_NCG)
 import qualified GHC.CmmToAsm.AArch64 as AArch64
-import qualified GHC.CmmToAsm.Wasm as Wasm32
+#endif
+#if defined(HAVE_PPC_NCG)
+import qualified GHC.CmmToAsm.PPC   as PPC
+#endif
+#if defined(HAVE_RISCV64_NCG)
 import qualified GHC.CmmToAsm.RV64  as RV64
+#endif
+#if defined(HAVE_LOONGARCH64_NCG)
 import qualified GHC.CmmToAsm.LA64 as LA64
+#endif
+#if defined(HAVE_WASM_BACKEND)
+import qualified GHC.CmmToAsm.Wasm as Wasm32
+#endif
+
 
 import GHC.CmmToAsm.Reg.Liveness
 import qualified GHC.CmmToAsm.Reg.Linear                as Linear
@@ -141,21 +156,35 @@ nativeCodeGen logger ts config modLoc h cmms
             => NcgImpl statics instr jumpDest -> UniqDSMT IO a
        nCG' ncgImpl = nativeCodeGen' logger config modLoc ncgImpl h cmms
    in case platformArch platform of
+#if defined(HAVE_X86_NCG)
       ArchX86       -> nCG' (X86.ncgX86     config)
       ArchX86_64    -> nCG' (X86.ncgX86_64  config)
+#endif
+#if defined(HAVE_PPC_NCG)
       ArchPPC       -> nCG' (PPC.ncgPPC     config)
       ArchPPC_64 _  -> nCG' (PPC.ncgPPC     config)
+#endif
       ArchS390X     -> panic "nativeCodeGen: No NCG for S390X"
       ArchARM {}    -> panic "nativeCodeGen: No NCG for ARM"
+#if defined(HAVE_AARCH64_NCG)
       ArchAArch64   -> nCG' (AArch64.ncgAArch64 config)
+#endif
       ArchAlpha     -> panic "nativeCodeGen: No NCG for Alpha"
       ArchMipseb    -> panic "nativeCodeGen: No NCG for mipseb"
       ArchMipsel    -> panic "nativeCodeGen: No NCG for mipsel"
+#if defined(HAVE_RISCV64_NCG)
       ArchRISCV64   -> nCG' (RV64.ncgRV64 config)
+#endif
+#if defined(HAVE_LOONGARCH64_NCG)
       ArchLoongArch64 -> nCG' (LA64.ncgLA64 config)
+#endif
       ArchUnknown   -> panic "nativeCodeGen: No NCG for unknown arch"
       ArchJavaScript-> panic "nativeCodeGen: No NCG for JavaScript"
+#if defined(HAVE_WASM_BACKEND)
       ArchWasm32    -> Wasm32.ncgWasm config logger platform ts modLoc h cmms
+#endif
+      _             -> panic "nativeCodeGen: No NCG for this architecture"
+
 
 -- | Data accumulated during code generation. Mostly about statistics,
 -- but also collects debug data for DWARF generation.