diff options
| author | Tamar Christina <tamar@zhox.com> | 2021-04-25 21:28:07 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-05-03 19:50:10 -0400 |
| commit | 4e54683465b317af58cb73a21760d3993c26ed5f (patch) | |
| tree | b9c5a065d9e87c043cb465bbe154adb699bf2949 | |
| parent | 3a2f2475f9cbf9c7acde6d794a2780ded492983b (diff) | |
| download | haskell-4e54683465b317af58cb73a21760d3993c26ed5f.tar.gz | |
pe: enable code unloading for Windows
| -rw-r--r-- | compiler/GHC/Linker/Loader.hs | 3 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler/GHC/Linker/Loader.hs b/compiler/GHC/Linker/Loader.hs index 2137725343..ee4c9a718b 100644 --- a/compiler/GHC/Linker/Loader.hs +++ b/compiler/GHC/Linker/Loader.hs @@ -1169,9 +1169,6 @@ unload_wkr interp keep_linkables pls@LoaderState{..} = do where unloadObjs :: Linkable -> IO () unloadObjs lnk - -- The RTS's PEi386 linker currently doesn't support unloading. - | isWindowsHost = return () - | hostIsDynamic = return () -- We don't do any cleanup when linking objects with the -- dynamic linker. Doing so introduces extra complexity for diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index bf0124a23a..fca3939f84 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -157,8 +157,7 @@ test('T6106', [extra_files(['../shell.hs']), test('T6105', normal, ghci_script, ['T6105.script']) test('T7117', normal, ghci_script, ['T7117.script']) test('ghci058', [extra_files(['../shell.hs']), - cmd_prefix('ghciWayFlags=' + config.ghci_way_flags), - when(opsys('mingw32'), expect_broken(16858))], + cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)], ghci_script, ['ghci058.script']) test('T7587', normal, ghci_script, ['T7587.script']) test('T7688', normal, ghci_script, ['T7688.script']) @@ -319,7 +318,8 @@ test('T17403', normal, ghci_script, ['T17403.script']) test('T17431', normal, ghci_script, ['T17431.script']) test('T17500', [extra_run_opts('-ddump-to-file -ddump-bcos')], ghci_script, ['T17500.script']) test('T17549', normal, ghci_script, ['T17549.script']) -test('T17669', [extra_run_opts('-fexternal-interpreter -fobject-code'), expect_broken(17669)], ghci_script, ['T17669.script']) +test('T17669', [extra_run_opts('-fexternal-interpreter -fobject-code'), + unless(opsys('mingw32'), expect_broken(17669))], ghci_script, ['T17669.script']) test('T18501', normal, ghci_script, ['T18501.script']) test('T18644', normal, ghci_script, ['T18644.script']) test('T18755', normal, ghci_script, ['T18755.script']) |