ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #384 from dicej/master

Browse Source 
fix iOS ARM64 build
This commit is contained in:
Joshua Warner 2014-12-30 19:42:28 -07:00
commit 38d2146d6f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -1655,7 +1655,8 @@ $(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
@echo "compiling classpath classes" @echo "compiling classpath classes"
@mkdir -p $(classpath-build) @mkdir -p $(classpath-build)
classes="$(shell $(MAKE) -s --no-print-directory build=$(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 \ $(javac) -source 1.6 -target 1.6 \
-d $(classpath-build) -bootclasspath $(boot-classpath) \ -d $(classpath-build) -bootclasspath $(boot-classpath) \
$${classes}; fi $${classes}; fi

7
src/compile-arm64.S
View File

@ -58,8 +58,11 @@ GLOBAL(vmInvoke):
mov x5, sp mov x5, sp
str x5, [x0,#TARGET_THREAD_SCRATCH] str x5, [x0,#TARGET_THREAD_SCRATCH]
// copy arguments into place // copy arguments into place, reserving enough space for them, plus
sub sp, sp, w3, uxtw // alignment padding
sub x5, sp, w3, uxtw
and sp, x5, #-16
mov x4, #0 mov x4, #0
b LOCAL(vmInvoke_argumentTest) b LOCAL(vmInvoke_argumentTest)