diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-26 23:14:32 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-06-27 13:59:52 -0400 |
| commit | e20fe447e1930fcb8d019904d1b26b4312a83522 (patch) | |
| tree | 824b7a70a822278c7efcb6c953be486d8dd8b665 | |
| parent | d15861a57003e0fbef1ce30e2944bef50763b5a2 (diff) | |
| download | haskell-e20fe447e1930fcb8d019904d1b26b4312a83522.tar.gz | |
Disable automatic use of -fobject-code due to #16876
| -rw-r--r-- | compiler/main/GhcMake.hs | 1 | ||||
| -rw-r--r-- | testsuite/tests/ghci/prog014/prog014.T | 1 | ||||
| -rw-r--r-- | testsuite/tests/ghci/should_run/all.T | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs index 03e0cb341a..7dbf5203bb 100644 --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -2089,6 +2089,7 @@ enableCodeGenForUnboxedTuples = enableCodeGenWhen condition should_modify TFL_GhcSession TFL_CurrentModule where condition ms = + False && -- disabled due to #16876 xopt LangExt.UnboxedTuples (ms_hspp_opts ms) && not (isBootSummary ms) should_modify (ModSummary { ms_hspp_opts = dflags }) = diff --git a/testsuite/tests/ghci/prog014/prog014.T b/testsuite/tests/ghci/prog014/prog014.T index d9dee7eac7..43481583c5 100644 --- a/testsuite/tests/ghci/prog014/prog014.T +++ b/testsuite/tests/ghci/prog014/prog014.T @@ -1,5 +1,6 @@ test('prog014', [extra_files(['Primop.hs', 'dummy.c']), extra_run_opts('dummy.o'), + expect_broken_for(15454, ['ghci']), pre_cmd('$MAKE -s --no-print-directory prog014')], ghci_script, ['prog014.script']) diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T index 43fe935e3e..e8f52a6334 100644 --- a/testsuite/tests/ghci/should_run/all.T +++ b/testsuite/tests/ghci/should_run/all.T @@ -36,7 +36,7 @@ test('T12549', just_ghci, ghci_script, ['T12549.script']) test('BinaryArray', normal, compile_and_run, ['']) test('T14125a', just_ghci, ghci_script, ['T14125a.script']) test('T13825-ghci',just_ghci, ghci_script, ['T13825-ghci.script']) -test('T14608', just_ghci, ghci_script, ['T14608.script']) +test('T14608', [just_ghci, expect_broken_for(15454, ['ghci'])], ghci_script, ['T14608.script']) test('T14963a', just_ghci, ghci_script, ['T14963a.script']) test('T14963b', just_ghci, ghci_script, ['T14963b.script']) test('T14963c', [extra_hc_opts("-fdefer-type-errors")], ghci_script, ['T14963c.script']) |