From df553cbdb6304e88499052ad6f41f14a64f4f65e Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Wed, 11 Jun 2014 09:54:48 -0600 Subject: [PATCH 1/2] don't create '1' file from docker/build.sh --- docker/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build.sh b/docker/build.sh index a53304918f..bdeb0dd6fa 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -8,7 +8,7 @@ if test $# -eq 0; then exit 1 fi -while test $# > 1 ; do +while test $# -gt 1 ; do key="$1" case $key in -c|--container) From ada6ce4cc3146ff7b897a9dfacab921bfb72f1f3 Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Wed, 11 Jun 2014 09:55:39 -0600 Subject: [PATCH 2/2] fix arm compiler abort --- src/codegen/compiler/event.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/codegen/compiler/event.cpp b/src/codegen/compiler/event.cpp index 44685f3cc0..a1dc94d95a 100644 --- a/src/codegen/compiler/event.cpp +++ b/src/codegen/compiler/event.cpp @@ -322,11 +322,11 @@ class CallEvent: public Event { unsigned argumentIndex = 0; while (true) { - Value* v = static_cast(arguments[index]); + Value* v = static_cast(arguments[argumentIndex]); unsigned footprint = (argumentIndex + 1 < arguments.count and v->nextWord - == arguments[index + 1]) + == arguments[argumentIndex + 1]) ? 2 : 1;