[Git][ghc/ghc][wip/interpreterDynamic] interpreterDynamic

[Cheng Shao (@TerrorJack)]

Cheng Shao pushed to branch wip/interpreterDynamic at Glasgow Haskell Compiler / GHC


Commits:
bbd46547 by Cheng Shao at 2024-10-04T00:00:41+00:00
interpreterDynamic

- - - - -


4 changed files:

- compiler/GHC/Linker/Loader.hs
- testsuite/tests/quasiquotation/Makefile
- testsuite/tests/quasiquotation/all.T
- testsuite/tests/th/all.T


Changes:

=====================================
compiler/GHC/Linker/Loader.hs
=====================================
@@ -566,7 +566,7 @@ preloadLib interp hsc_env lib_paths framework_paths pls lib_spec = do
     preload_statics _paths names
        = do b <- or <$> mapM doesFileExist names
             if not b then return (False, pls)
-                     else if hostIsDynamic
+                     else if interpreterDynamic interp
                              then  do pls1 <- dynLoadObjs interp hsc_env pls names
                                       return (True, pls1)
                              else  do mapM_ (loadObj interp) names
@@ -575,7 +575,7 @@ preloadLib interp hsc_env lib_paths framework_paths pls lib_spec = do
     preload_static_archive _paths name
        = do b <- doesFileExist name
             if not b then return False
-                     else do if hostIsDynamic
+                     else do if interpreterDynamic interp
                                  then throwGhcExceptionIO $
                                       CmdLineError dynamic_msg
                                  else loadArchive interp name


=====================================
testsuite/tests/quasiquotation/Makefile
=====================================
@@ -10,6 +10,6 @@ T4150:
 	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T4150.hs
 
 T14028:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 T14028Quote.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -fPIC -c T14028C.c
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -fexternal-interpreter T14028 T14028C.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 T14028Quote.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T14028C.c -o T14028C.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -fexternal-interpreter T14028 T14028C.o


=====================================
testsuite/tests/quasiquotation/all.T
=====================================
@@ -10,4 +10,4 @@ test('T14028',
       only_ways([config.ghc_th_way]),
       unless(config.have_ext_interp, skip),
       when(opsys('freebsd'), expect_broken(19723))],
-     makefile_test, ['T14028'])
+     makefile_test, ['T14028 ghcThWayFlags=' + config.ghc_th_way_flags])


=====================================
testsuite/tests/th/all.T
=====================================
@@ -591,7 +591,7 @@ test('T23829_hasty', normal, compile_fail, [''])
 test('T23829_hasty_b', normal, compile_fail, [''])
 test('T23927', normal, compile_and_run, [''])
 test('T23954', normal, compile_and_run, [''])
-test('T23309', [extra_files(['T23309A.hs']), req_c], multimod_compile, ['T23309', '-v0 T23309.c -optc-fPIC'])
+test('T23309', [extra_files(['T23309A.hs']), req_c], multimod_compile, ['T23309', '-v0 T23309.c ' + config.ghc_th_way_flags])
 test('T23378', [extra_files(['T23378A.hs']), js_skip], multimod_compile, ['T23378', '-v0'])
 test('T23962', normal, compile_and_run, [''])
 test('T23968', normal, compile_and_run, [''])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bbd4654769bc545a6cc28e51c0c2caeed832ba55

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bbd4654769bc545a6cc28e51c0c2caeed832ba55
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/20241003/44eb9230/attachment-0001.html>