Commit 87202332 authored by Kevin Modzelewski's avatar Kevin Modzelewski

Makefile cleanup

Make rules more general, and generate rules that can't be patterns
Made it easy to add a pyston_grwl target
parent 94061fa5
...@@ -15,6 +15,7 @@ pyston_debug ...@@ -15,6 +15,7 @@ pyston_debug
pyston_prof pyston_prof
pyston_profile pyston_profile
pyston_release pyston_release
pyston_grwl
*.cache *.cache
tests/t.py tests/t.py
tests/t2.py tests/t2.py
......
This diff is collapsed.
...@@ -57,8 +57,10 @@ std::vector<ThreadState> getAllThreadStates(); ...@@ -57,8 +57,10 @@ std::vector<ThreadState> getAllThreadStates();
// be the highest address). // be the highest address).
void* getStackBottom(); void* getStackBottom();
#ifndef THREADING_USE_GIL
#define THREADING_USE_GIL 1 #define THREADING_USE_GIL 1
#define THREADING_USE_GRWL 0 #define THREADING_USE_GRWL 0
#endif
#define THREADING_SAFE_DATASTRUCTURES THREADING_USE_GRWL #define THREADING_SAFE_DATASTRUCTURES THREADING_USE_GRWL
#if THREADING_SAFE_DATASTRUCTURES #if THREADING_SAFE_DATASTRUCTURES
......
...@@ -97,6 +97,8 @@ void BoxedList::ensure(int space) { ...@@ -97,6 +97,8 @@ void BoxedList::ensure(int space) {
// TODO the inliner doesn't want to inline these; is there any point to having them in the inline section? // TODO the inliner doesn't want to inline these; is there any point to having them in the inline section?
extern "C" void listAppendInternal(Box* s, Box* v) { extern "C" void listAppendInternal(Box* s, Box* v) {
// Lock must be held!
assert(s->cls == list_cls); assert(s->cls == list_cls);
BoxedList* self = static_cast<BoxedList*>(s); BoxedList* self = static_cast<BoxedList*>(s);
......
...@@ -290,7 +290,7 @@ if __name__ == "__main__": ...@@ -290,7 +290,7 @@ if __name__ == "__main__":
run_memcheck = False run_memcheck = False
start = 1 start = 1
opts, patterns = getopt.getopt(sys.argv[1:], "j:a:t:mRPk") opts, patterns = getopt.getopt(sys.argv[1:], "j:a:t:mR:k")
for (t, v) in opts: for (t, v) in opts:
if t == '-m': if t == '-m':
run_memcheck = True run_memcheck = True
...@@ -298,9 +298,7 @@ if __name__ == "__main__": ...@@ -298,9 +298,7 @@ if __name__ == "__main__":
NUM_THREADS = int(v) NUM_THREADS = int(v)
assert NUM_THREADS > 0 assert NUM_THREADS > 0
elif t == '-R': elif t == '-R':
IMAGE = "pyston" IMAGE = v
elif t == '-P':
IMAGE = "pyston_prof"
elif t == '-k': elif t == '-k':
KEEP_GOING = True KEEP_GOING = True
elif t == '-a': elif t == '-a':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment