[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: testsuite: Drop --io-manager flag from testsuite configuration

[Marge Bot]

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


Commits:
789951d3 by Ben Gamari at 2020-08-14T10:00:28-04:00
testsuite: Drop --io-manager flag from testsuite configuration

This is no longer necessary as there are now dedicated testsuite ways
which run tests with WinIO.

- - - - -
e340997e by Ben Gamari at 2020-08-14T10:00:28-04:00
llvm-targets: Add i686 targets

Addresses #18422.

- - - - -


3 changed files:

- llvm-targets
- testsuite/mk/test.mk
- utils/llvm-targets/gen-data-layout.sh


Changes:

=====================================
llvm-targets
=====================================
@@ -24,6 +24,9 @@
 ,("i386-unknown-linux-gnu", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
 ,("i386-unknown-linux-musl", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
 ,("i386-unknown-linux", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
+,("i686-unknown-linux-gnu", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
+,("i686-unknown-linux-musl", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
+,("i686-unknown-linux", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
 ,("x86_64-unknown-linux-gnu", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
 ,("x86_64-unknown-linux-musl", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
 ,("x86_64-unknown-linux", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))


=====================================
testsuite/mk/test.mk
=====================================
@@ -60,7 +60,7 @@ TEST_HC_OPTS += -Werror=compat
 # removing this line.
 TEST_HC_OPTS += -dno-debug-output
 
-TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-history +RTS --io-manager=native -RTS
+TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-history
 
 
 RUNTEST_OPTS =


=====================================
utils/llvm-targets/gen-data-layout.sh
=====================================
@@ -59,6 +59,9 @@ TARGETS=(
     "i386-unknown-linux-gnu"
     "i386-unknown-linux-musl"
     "i386-unknown-linux"
+    "i686-unknown-linux-gnu"
+    "i686-unknown-linux-musl"
+    "i686-unknown-linux"
     "x86_64-unknown-linux-gnu"
     "x86_64-unknown-linux-musl"
     "x86_64-unknown-linux"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/93531ecb3c8e811c364e12992ad6b8aadeb860da...e340997e91828df27af37667f4f8fcbcd4b65e32

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/93531ecb3c8e811c364e12992ad6b8aadeb860da...e340997e91828df27af37667f4f8fcbcd4b65e32
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/20200814/432a8a9b/attachment-0001.html>