[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: ghc-toolchain: Parse i686 triples

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
70d30fea by Ben Gamari at 2025-02-04T05:33:12-05:00
ghc-toolchain: Parse i686 triples

This is a moniker used for later 32-bit x86 implementations
(Pentium Pro and later).

Fixes #25691.

- - - - -
eabffd14 by Cheng Shao at 2025-02-04T05:33:12-05:00
compiler: remove unused assembleOneBCO function

This patch removes the unused assembleOneBCO function from the
bytecode assembler.

- - - - -


2 changed files:

- compiler/GHC/ByteCode/Asm.hs
- utils/ghc-toolchain/src/GHC/Toolchain/ParseTriple.hs


Changes:

=====================================
compiler/GHC/ByteCode/Asm.hs
=====================================
@@ -8,7 +8,7 @@
 
 -- | Bytecode assembler and linker
 module GHC.ByteCode.Asm (
-        assembleBCOs, assembleOneBCO,
+        assembleBCOs,
         bcoFreeNames,
         SizedSeq, sizeSS, ssElts,
         iNTERP_STACK_CHECK_THRESH,
@@ -34,7 +34,6 @@ import GHC.Utils.Outputable
 import GHC.Utils.Panic
 
 import GHC.Core.TyCon
-import GHC.Data.FlatBag
 import GHC.Data.SizedSeq
 
 import GHC.StgToCmm.Layout     ( ArgRep(..) )
@@ -168,15 +167,6 @@ mallocStrings interp ulbcos = do
   collectPtr (BCOPtrBCO bco) = collect bco
   collectPtr _ = return ()
 
-
-assembleOneBCO :: Interp -> Profile -> ProtoBCO Name -> IO UnlinkedBCO
-assembleOneBCO interp profile pbco = do
-  -- TODO: the profile should be bundled with the interpreter: the rts ways are
-  -- fixed for an interpreter
-  ubco <- assembleBCO (profilePlatform profile) pbco
-  UnitFlatBag ubco' <- mallocStrings interp (UnitFlatBag ubco)
-  return ubco'
-
 assembleBCO :: Platform -> ProtoBCO Name -> IO UnlinkedBCO
 assembleBCO platform
             (ProtoBCO { protoBCOName       = nm


=====================================
utils/ghc-toolchain/src/GHC/Toolchain/ParseTriple.hs
=====================================
@@ -36,6 +36,7 @@ parseArch :: Cc -> String -> M Arch
 parseArch cc arch =
     case arch of
       "i386" -> pure ArchX86
+      "i686" -> pure ArchX86
       "x86_64" -> pure ArchX86_64
       "amd64" -> pure ArchX86_64
       "powerpc" -> pure ArchPPC



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7d02093878a7cdf7a4e5ad7c8187e7d4f37f3f68...eabffd144dea36db311b12b275f6e3cafe9543b5

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7d02093878a7cdf7a4e5ad7c8187e7d4f37f3f68...eabffd144dea36db311b12b275f6e3cafe9543b5
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/20250204/d813cd62/attachment-0001.html>