From 80ce92a99943365e5e61d8ef64b2b85b16ec2d66 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 30 Dec 2014 17:03:58 -0700 Subject: [PATCH] fix iOS ARM64 build --- makefile | 3 ++- src/compile-arm64.S | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 008a230901..9224471195 100755 --- a/makefile +++ b/makefile @@ -1655,7 +1655,8 @@ $(classpath-dep): $(classpath-sources) $(classpath-jar-dep) @echo "compiling classpath classes" @mkdir -p $(classpath-build) classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \ - $(classpath-classes))"; if [ -n "$${classes}" ]; then \ + $(classpath-classes) arch=$(build-arch) platform=$(build-platform))"; \ + if [ -n "$${classes}" ]; then \ $(javac) -source 1.6 -target 1.6 \ -d $(classpath-build) -bootclasspath $(boot-classpath) \ $${classes}; fi diff --git a/src/compile-arm64.S b/src/compile-arm64.S index c1c9c942b2..98436a15a0 100644 --- a/src/compile-arm64.S +++ b/src/compile-arm64.S @@ -58,8 +58,11 @@ GLOBAL(vmInvoke): mov x5, sp str x5, [x0,#TARGET_THREAD_SCRATCH] - // copy arguments into place - sub sp, sp, w3, uxtw + // copy arguments into place, reserving enough space for them, plus + // alignment padding + sub x5, sp, w3, uxtw + and sp, x5, #-16 + mov x4, #0 b LOCAL(vmInvoke_argumentTest)