[Git][ghc/ghc][wip/supersven/ghc-9.10-riscv-ncg] 3 commits: Add comment

[Sven Tennie (@supersven)]

Sven Tennie pushed to branch wip/supersven/ghc-9.10-riscv-ncg at Glasgow Haskell Compiler / GHC


Commits:
ed3ab385 by Sven Tennie at 2024-06-15T16:00:04+00:00
Add comment

- - - - -
5d9729a6 by Sven Tennie at 2024-06-15T16:34:11+00:00
Drop unnecessary testsuite driver changes

- - - - -
68248914 by Sven Tennie at 2024-06-15T17:18:00+00:00
Expect elf.h as system include

This (hopefully) fixes this error on Darwin:

```
rts/linker/elf_reloc_riscv64.c:6:10: error:
     error: non-portable path to file '"Elf.h"'; specified path differs in case from file name on disk [-Werror,-Wnonportable-include-path]
  |
6 | #include "elf.h"
  |          ^
         ^~~~~~~
         "Elf.h"
```

- - - - -


4 changed files:

- compiler/GHC/CmmToAsm/PIC.hs
- rts/linker/elf_reloc_riscv64.c
- testsuite/driver/runtests.py
- testsuite/driver/testlib.py


Changes:

=====================================
compiler/GHC/CmmToAsm/PIC.hs
=====================================
@@ -169,10 +169,10 @@ cmmMakePicReference config lbl
   | ArchAArch64 <- platformArch platform
   = CmmLit $ CmmLabel lbl
 
+  -- as on AArch64, there's no pic base register.
   | ArchRISCV64 <- platformArch platform
   = CmmLit $ CmmLabel lbl
 
-
   | OSAIX <- platformOS platform
   = CmmMachOp (MO_Add W32)
           [ CmmReg (CmmGlobal $ GlobalRegUse PicBaseReg (bWord platform))


=====================================
rts/linker/elf_reloc_riscv64.c
=====================================
@@ -3,7 +3,7 @@
 #include "Rts.h"
 #include "Stg.h"
 #include "SymbolExtras.h"
-#include "elf.h"
+#include <elf.h>
 #include "elf_plt.h"
 #include "elf_util.h"
 #include "rts/Messages.h"


=====================================
testsuite/driver/runtests.py
=====================================
@@ -78,7 +78,6 @@ parser.add_argument("--metrics-file", help="file in which to save (append) the p
 parser.add_argument("--summary-file", help="file in which to save the (human-readable) summary")
 parser.add_argument("--unexpected-output-dir", help="directory in which to place unexpected output")
 parser.add_argument("--target-wrapper", help="wrapper executable to use when executing binaries compiled for the target")
-parser.add_argument("--no-print-summary", action="store_true", help="should we print the summary?")
 parser.add_argument("--only", action="append", help="just this test (can be give multiple --only= flags)")
 parser.add_argument("--way", action="append", help="just this way")
 parser.add_argument("--skipway", action="append", help="skip this way")


=====================================
testsuite/driver/testlib.py
=====================================
@@ -95,10 +95,6 @@ def isCross() -> bool:
     """ Are we testing a cross-compiler? """
     return config.target_wrapper is not None
 
-def isCross() -> bool:
-    """ Are we testing a cross-compiler? """
-    return config.target_wrapper is not None
-
 def isCompilerStatsTest() -> bool:
     opts = getTestOpts()
     return bool(opts.is_compiler_stats_test)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f93e13239e0805213faf64c90672b14576619d35...68248914206de3db164c16b15a29d0361fed2802

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f93e13239e0805213faf64c90672b14576619d35...68248914206de3db164c16b15a29d0361fed2802
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/20240615/073b3958/attachment-0001.html>