diff options
| author | Michael Bebenita <[email protected]> | 2010-08-24 21:06:56 -0700 |
|---|---|---|
| committer | Michael Bebenita <[email protected]> | 2010-08-24 21:07:14 -0700 |
| commit | 64ff82ecf98ceb4725f0f51c73e23d1efc2160bc (patch) | |
| tree | 6a6ae7452066716947c4d262eb72041a6a11cb95 /src/Makefile | |
| parent | Comment on env var required for std.dbg to do any logging. (diff) | |
| download | rust-64ff82ecf98ceb4725f0f51c73e23d1efc2160bc.tar.xz rust-64ff82ecf98ceb4725f0f51c73e23d1efc2160bc.zip | |
Implemented an lock free queue based on this paper http://www.cs.rochester.edu/~scott/papers/1996_PODC_queues.pdf, the "lock free queue" we had before wasn't lock free at all.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 08699538..3de9b38c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,7 +34,7 @@ DSYMUTIL := true ifeq ($(CFG_OSTYPE), Linux) CFG_RUNTIME := librustrt.so CFG_STDLIB := libstd.so - CFG_GCC_CFLAGS += -fPIC + CFG_GCC_CFLAGS += -fPIC -march=i686 CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt ifeq ($(CFG_CPUTYPE), x86_64) CFG_GCC_CFLAGS += -m32 @@ -107,7 +107,7 @@ ifdef CFG_UNIXY endif CFG_OBJ_SUFFIX := .o CFG_EXE_SUFFIX := .exe - CFG_GCC_CFLAGS := + CFG_GCC_CFLAGS := -march=i686 CFG_GCC_LINK_FLAGS := -shared ifeq ($(CFG_CPUTYPE), x86_64) CFG_GCC_CFLAGS += -m32 @@ -248,7 +248,6 @@ BOOT_CMIS := $(BOOT_MLS:.ml=.cmi) RUNTIME_CS := rt/sync/timer.cpp \ rt/sync/sync.cpp \ rt/sync/spin_lock.cpp \ - rt/sync/lock_free_queue.cpp \ rt/sync/condition_variable.cpp \ rt/rust.cpp \ rt/rust_builtin.cpp \ @@ -286,6 +285,7 @@ RUNTIME_HDR := rt/globals.h \ rt/util/hash_map.h \ rt/sync/sync.h \ rt/sync/timer.h \ + rt/sync/lock_free_queue.h \ rt/rust_srv.h \ rt/memory_region.h \ rt/memory.h @@ -394,7 +394,9 @@ TASK_XFAILS := test/run-pass/acyclic-unwind.rs \ test/run-pass/task-life-0.rs \ test/run-pass/task-comm.rs \ test/run-pass/threads.rs \ - test/run-pass/yield.rs + test/run-pass/yield.rs \ + test/run-pass/task-comm-15.rs \ + test/run-pass/task-life-0.rs TEST_XFAILS_X86 := $(TASK_XFAILS) \ test/run-pass/child-outlives-parent.rs \ @@ -537,6 +539,11 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ task-comm-9.rs \ task-comm-10.rs \ task-comm-11.rs \ + task-comm-12.rs \ + task-comm-13.rs \ + task-comm-13-thread.rs \ + task-comm-14.rs \ + task-comm-15.rs \ task-life-0.rs \ threads.rs \ type-sizes.rs \ |