diff options
| author | Graydon Hoare <[email protected]> | 2010-09-08 19:13:49 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-09-08 19:13:49 -0700 |
| commit | 616b7afb724a32df41eebfaf95402d008c60b411 (patch) | |
| tree | 03e13578e8b43b9001cef983d1117800a6f93e65 /src/Makefile | |
| parent | XFAIL many.rs since it crashes on win32, and add a time-slice sleep to the ke... (diff) | |
| download | rust-616b7afb724a32df41eebfaf95402d008c60b411.tar.xz rust-616b7afb724a32df41eebfaf95402d008c60b411.zip | |
Tidy up the sync dir, remove dead or mis-designed code in favour of OS primitives, switch rust_kernel to use a lock/signal pair and wait rather than spin.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index dfe8a063..d44dba97 100644 --- a/src/Makefile +++ b/src/Makefile @@ -248,8 +248,7 @@ BOOT_CMIS := $(BOOT_MLS:.ml=.cmi) RUNTIME_CS := rt/sync/timer.cpp \ rt/sync/sync.cpp \ - rt/sync/spin_lock.cpp \ - rt/sync/condition_variable.cpp \ + rt/sync/lock_and_signal.cpp \ rt/rust.cpp \ rt/rust_builtin.cpp \ rt/rust_crate.cpp \ @@ -383,6 +382,9 @@ self: $(CFG_COMPILER) TASK_XFAILS := test/run-pass/task-comm-8.rs \ test/run-pass/task-comm-10.rs \ test/run-pass/task-comm-15.rs \ + test/run-pass/task-comm-12.rs \ + test/run-pass/task-comm-2.rs \ + test/run-pass/task-comm-9.rs \ test/run-pass/task-life-0.rs \ test/run-pass/alt-type-simple.rs \ test/run-pass/many.rs @@ -936,3 +938,11 @@ clean: $(CFG_QUIET)rm -Rf $(PKG_NAME)-*.tar.gz dist $(CFG_QUIET)rm -f $(foreach ext,cmx cmi cmo cma o a d exe,\ $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext))) + + +# Local Variables: +# mode: makefile-gmake +# fill-column: 78; +# buffer-file-coding-system: utf-8-unix +# compile-command: "make -k 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +# End: |