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)