[Git][ghc/ghc][master] 2 commits: testsuite: Fix typo when setting llvm_ways

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
0fa2d185 by Matthew Pickering at 2022-10-17T19:23:10-04:00
testsuite: Fix typo when setting llvm_ways

Since 2014 llvm_ways has been set to [] so none of the tests which use
only_ways(llvm_ways) have worked as expected.

Hopefully the tests still pass with this typo fix!

- - - - -
ced664a2 by Krzysztof Gogolewski at 2022-10-17T19:23:10-04:00
Fix T15155l not getting -fllvm

- - - - -


2 changed files:

- testsuite/config/ghc
- testsuite/tests/codeGen/should_compile/Makefile


Changes:

=====================================
testsuite/config/ghc
=====================================
@@ -176,8 +176,7 @@ opt_ways      = [x[0] for x in config.way_flags.items()
                       if '-O' in x[1]]
 
 llvm_ways     = [x[0] for x in config.way_flags.items()
-                      if '-fflvm' in x[1]]
-
+                      if '-fllvm' in x[1]]
 
 def get_compiler_info():
     if config.unregisterised:


=====================================
testsuite/tests/codeGen/should_compile/Makefile
=====================================
@@ -57,7 +57,7 @@ T15155:
 # Same as above, but in LLVM. Check that the static indirection b is compiled to
 # an alias.
 T15155l:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O0 -ddump-llvm T15155l.hs 2>/dev/null | \
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O0 -fllvm -ddump-llvm T15155l.hs 2>/dev/null | \
 		grep -F "@T15155_b_closure = alias i8, i8* @T15155_a_closure"
 
 # Without -fcatch-nonexhaustive-cases `f` is non-CAFFY. With



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0d9fb651768f0b88be0a564deebbbd2391104ab4...ced664a27247730925530d39c83b879969b68709

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0d9fb651768f0b88be0a564deebbbd2391104ab4...ced664a27247730925530d39c83b879969b68709
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/20221017/cff85c56/attachment-0001.html>