diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-12-04 10:12:01 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-12-05 10:06:13 +0000 |
| commit | 55a2a0b4893486e5dde151620d7f46e8035d2af5 (patch) | |
| tree | ea727a15ccceaf00d761252340331d2154d76b67 /testsuite/tests/rts/Makefile | |
| parent | 78edd76047d255bb543f7ce5517477f371bb2f0b (diff) | |
| download | haskell-55a2a0b4893486e5dde151620d7f46e8035d2af5.tar.gz | |
Revert "Revert "Make the linker API thread-safe""
Also includes a fix for the segfaults on Windows caused by the original
version of this patch.
This reverts commit 4b51194df4090d984f02c12128e868077660fb8b.
Diffstat (limited to 'testsuite/tests/rts/Makefile')
| -rw-r--r-- | testsuite/tests/rts/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile index 8a7cb8af02..c943bb4135 100644 --- a/testsuite/tests/rts/Makefile +++ b/testsuite/tests/rts/Makefile @@ -124,7 +124,7 @@ linker_unload: $(RM) Test.o Test.hi "$(TEST_HC)" $(TEST_HC_OPTS) -c Test.hs -v0 # -rtsopts causes a warning - "$(TEST_HC)" $(filter-out -rtsopts, $(TEST_HC_OPTS)) linker_unload.c -o linker_unload -no-hs-main -optc-Werror -debug -optc-g + "$(TEST_HC)" $(filter-out -rtsopts, $(TEST_HC_OPTS)) linker_unload.c -o linker_unload -no-hs-main -optc-Werror -threaded ./linker_unload $(BASE) $(GHC_PRIM) $(INTEGER_GMP) # ----------------------------------------------------------------------------- @@ -142,7 +142,7 @@ linker_unload: .PHONY: linker_error1 linker_error1: "$(TEST_HC)" -c linker_error.c -o linker_error1.o - "$(TEST_HC)" linker_error1.o -o linker_error1 -no-hs-main -optc-g -debug + "$(TEST_HC)" linker_error1.o -o linker_error1 -no-hs-main -optc-g -debug -threaded ./linker_error1 linker_error.c # linker_error2: the object file has an unknown symbol (fails in @@ -152,7 +152,7 @@ linker_error1: linker_error2: "$(TEST_HC)" -c linker_error.c -o linker_error2.o "$(TEST_HC)" -c linker_error2.c -o linker_error2_o.o - "$(TEST_HC)" linker_error2.o -o linker_error2 -no-hs-main -optc-g -debug + "$(TEST_HC)" linker_error2.o -o linker_error2 -no-hs-main -optc-g -debug -threaded ./linker_error2 linker_error2_o.o # linker_error3: the object file duplicates an existing symbol (fails @@ -162,5 +162,5 @@ linker_error2: linker_error3: "$(TEST_HC)" -c linker_error.c -o linker_error3.o "$(TEST_HC)" -c linker_error3.c -o linker_error3_o.o - "$(TEST_HC)" linker_error3.o -o linker_error3 -no-hs-main -optc-g -debug + "$(TEST_HC)" linker_error3.o -o linker_error3 -no-hs-main -optc-g -debug -threaded ./linker_error3 linker_error3_o.o |