about summary refs log tree commit diff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMichael Bebenita <mbebenita@mozilla.com>2010-08-17 23:40:07 -0700
committerMichael Bebenita <mbebenita@mozilla.com>2010-08-17 23:49:57 -0700
commit2c1ec6771bd09266308686ab13ca32e2aa73da49 (patch)
treeacbcae9da89c0f6d37fccdf8b4091f003e798683 /src/Makefile
parent9fa2b53d8c41cd717ed470926a746bdbff98dc35 (diff)
downloadrust-2c1ec6771bd09266308686ab13ca32e2aa73da49.tar.gz
rust-2c1ec6771bd09266308686ab13ca32e2aa73da49.zip
Lots of changes around memory managment in the Runtime. Added memory regions and fixed race caused by calling rust_srv::malloc() from multiple threads when sending messages.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 1ba681fdb7d..949490fa18b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -266,7 +266,8 @@ RUNTIME_CS := rt/sync/timer.cpp \
               rt/rust_timer.cpp \
               rt/circular_buffer.cpp \
               rt/isaac/randport.cpp \
-              rt/rust_srv.cpp
+              rt/rust_srv.cpp \
+              rt/memory_region.cpp
 
 RUNTIME_HDR := rt/globals.h \
                rt/rust.h \
@@ -285,7 +286,9 @@ RUNTIME_HDR := rt/globals.h \
                rt/util/hash_map.h \
                rt/sync/sync.h \
                rt/sync/timer.h \
-               rt/rust_srv.h
+               rt/rust_srv.h \
+               rt/memory_region.h \
+               rt/memory.h
 
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=$(CFG_OBJ_SUFFIX))