[Git][ghc/ghc][wip/backports-9.0] 3 commits: hadrian: Pass input file to makeindex

[Ben Gamari]

Ben Gamari pushed to branch wip/backports-9.0 at Glasgow Haskell Compiler / GHC


Commits:
2a622d0f by Ben Gamari at 2020-12-01T21:39:09+00:00
hadrian: Pass input file to makeindex

Strangely I find that on Alpine (and apparently only on Alpine) the
latex makeindex command expects to be given a filename, lest it reads
from stdin.

(cherry picked from commit 389a668343c0d4f5fa095112ff98d0da6998e99d)

- - - - -
553ec815 by GHC GitLab CI at 2020-12-01T22:19:04+00:00
Fix various documentation issues

- - - - -
007055cc by GHC GitLab CI at 2020-12-01T22:19:12+00:00
Fix cas_int

- - - - -


5 changed files:

- docs/users_guide/9.0.1-notes.rst
- docs/users_guide/ghci.rst
- docs/users_guide/runtime_control.rst
- hadrian/src/Builder.hs
- testsuite/tests/codeGen/should_run/cas_int.hs


Changes:

=====================================
docs/users_guide/9.0.1-notes.rst
=====================================
@@ -56,7 +56,9 @@ Highlights
 
   - GHC now relies on a new ``ghc-bignum`` package to provide Integer/Natural
     implementations. This package supports the following backends:
+
       - gmp: adapted from integer-gmp package that was used before
+
       - native: new Haskell implementation, faster than ``integer-simple`` which is
         not used anymore
 


=====================================
docs/users_guide/ghci.rst
=====================================
@@ -2549,6 +2549,7 @@ commonly used commands.
     be used.
 
     .. code-block:: none
+
         ghci>:set -XDataKinds -XUndecidableInstances
         ghci>import GHC.TypeLits
         ghci>class A a


=====================================
docs/users_guide/runtime_control.rst
=====================================
@@ -183,6 +183,10 @@ Event log output
 Furthermore GHC lets you specify the way event log data (see :rts-flag:`-l
 ⟨flags⟩`) is written through a custom :c:type:`EventLogWriter`:
 
+.. c:type:: size_t
+
+    :hidden:
+
 .. c:type:: EventLogWriter
 
     A sink of event-log data.


=====================================
hadrian/src/Builder.hs
=====================================
@@ -282,7 +282,7 @@ instance H.Builder Builder where
                   cmd' echo [path] "--no-split" [ "-o", output] [input]
 
                 Xelatex   -> unit $ cmd' [Cwd output] [path] buildArgs
-                Makeindex -> unit $ cmd' [Cwd output] [path] buildArgs
+                Makeindex -> unit $ cmd' [Cwd output] [path] (buildArgs ++ [input])
 
                 Tar _ -> cmd' buildOptions echo [path] buildArgs
                 _  -> cmd' echo [path] buildArgs


=====================================
testsuite/tests/codeGen/should_run/cas_int.hs
=====================================
@@ -26,16 +26,16 @@ import GHC.Ptr
 #include "MachDeps.h"
 
 main = do
-   alloca $ \(ptr_p :: Ptr (Ptr Int)) -> do
-   alloca $ \(ptr_i :: Ptr Int) -> do
-   alloca $ \(ptr_j :: Ptr Int) -> do
-      poke ptr_i (1 :: Int)
-      poke ptr_j (2 :: Int)
+   alloca $ \(ptr_p :: Ptr (Ptr Word)) -> do
+   alloca $ \(ptr_i :: Ptr Word) -> do
+   alloca $ \(ptr_j :: Ptr Word) -> do
+      poke ptr_i (1 :: Word)
+      poke ptr_j (2 :: Word)
 
       --expected to swap
-      res_i <- cas ptr_i 1 3 :: IO Int
+      res_i <- cas ptr_i 1 3 :: IO Word
       -- expected to fail
-      res_j <- cas ptr_j 1 4 :: IO Int
+      res_j <- cas ptr_j 1 4 :: IO Word
 
       putStrLn "Returned results:"
       --(1,2)
@@ -48,7 +48,7 @@ main = do
       --(3,2)
       print (i,j)
 
-cas :: Ptr Int -> Int -> Int -> IO Int
-cas (Ptr ptr) (I# expected) (I# desired)= do
-   IO $ \s -> case (atomicCasInt# ptr expected desired s) of
-            (# s2, old_val #) -> (# s2, I# old_val #)
+cas :: Ptr Word -> Word -> Word -> IO Word
+cas (Ptr ptr) (W# expected) (W# desired)= do
+   IO $ \s -> case (atomicCasWordAddr# ptr expected desired s) of
+            (# s2, old_val #) -> (# s2, W# old_val #)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85822a8881a7463b479b07d0b4d627a44930f058...007055cc5856caeac957489bd4ce061cf4b43459

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85822a8881a7463b479b07d0b4d627a44930f058...007055cc5856caeac957489bd4ce061cf4b43459
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/20201201/2136f17f/attachment-0001.html>