diff options
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 7236e02f..496457bb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -245,7 +245,8 @@ BOOT_CMXS := $(BOOT_MLS:.ml=.cmx) BOOT_OBJS := $(BOOT_MLS:.ml=.o) BOOT_CMIS := $(BOOT_MLS:.ml=.cmi) -RUNTIME_CS := rt/sync/spin_lock.cpp \ +RUNTIME_CS := rt/sync/sync.cpp \ + rt/sync/spin_lock.cpp \ rt/sync/lock_free_queue.cpp \ rt/sync/condition_variable.cpp \ rt/rust.cpp \ @@ -279,7 +280,8 @@ RUNTIME_HDR := rt/globals.h \ rt/rust_message.h \ rt/circular_buffer.h \ rt/util/array_list.h \ - rt/util/hash_map.h + rt/util/hash_map.h \ + rt/sync/sync.h RUNTIME_INCS := -Irt/isaac -Irt/uthash RUNTIME_OBJS := $(RUNTIME_CS:.cpp=$(CFG_OBJ_SUFFIX)) @@ -383,17 +385,22 @@ TASK_XFAILS := test/run-pass/acyclic-unwind.rs \ test/run-pass/threads.rs \ test/run-pass/yield.rs +TEST_XFAILS := test/run-pass/arith-0.rs + TEST_XFAILS_X86 := $(TASK_XFAILS) \ + $(TEST_XFAILS) \ test/run-pass/arithmetic-interference.rs \ test/run-pass/bind-obj-ctor.rs \ test/run-pass/child-outlives-parent.rs \ test/run-pass/clone-with-exterior.rs \ test/run-pass/constrained-type.rs \ + test/run-pass/destructor-ordering.rs \ test/run-pass/obj-as.rs \ test/run-pass/vec-slice.rs \ test/run-pass/fn-lval.rs \ test/run-pass/generic-fn-infer.rs \ test/run-pass/generic-recursive-tag.rs \ + test/run-pass/int-lib.rs \ test/run-pass/iter-ret.rs \ test/run-pass/lib-deque.rs \ test/run-pass/lib-map.rs \ @@ -412,16 +419,19 @@ TEST_XFAILS_X86 := $(TASK_XFAILS) \ test/compile-fail/writing-through-read-alias.rs TEST_XFAILS_LLVM := $(TASK_XFAILS) \ + $(TEST_XFAILS) \ $(addprefix test/run-pass/, \ + arith-1.rs \ acyclic-unwind.rs \ alt-pattern-simple.rs \ alt-tag.rs \ arithmetic-interference.rs \ argv.rs \ - auto-deref.rs \ autoderef-full-lval.rs \ autoderef-objfn.rs \ basic.rs \ + basic-1.rs \ + basic-2.rs \ bind-obj-ctor.rs \ bind-thunk.rs \ bind-trivial.rs \ @@ -452,7 +462,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ generic-drop-glue.rs \ generic-exterior-box.rs \ generic-fn-infer.rs \ - generic-fn-twice.rs \ generic-fn.rs \ generic-obj-with-derived-type.rs \ generic-obj.rs \ @@ -463,7 +472,8 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ i32-sub.rs \ i8-incr.rs \ import.rs \ - inner-module.rs \ + integral-indexing.rs \ + int-lib.rs \ iter-range.rs \ iter-ret.rs \ large-records.rs \ @@ -481,8 +491,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ mutable-alias-vec.rs \ mutable-vec-drop.rs \ mutual-recursion-group.rs \ - native-mod.rc \ - native.rc \ obj-as.rs \ obj-drop.rs \ obj-dtor.rs \ @@ -506,6 +514,7 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ str-append.rs \ str-concat.rs \ str-idx.rs \ + str-lib.rs \ tag.rs \ tail-cps.rs \ tail-direct.rs \ |