From 56267b765c8466e8d03ae250af7d13ab3e50ca8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 14 Dec 2015 23:34:34 +0200 Subject: [PATCH] Handle Go 1.6 CGO prologue, sync arm64 fix with opened CL --- docker/base/android_arm64.patch | 19 ++++++------------- docker/base/build.sh | 1 + 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docker/base/android_arm64.patch b/docker/base/android_arm64.patch index 7cf09ae..fe514d9 100644 --- a/docker/base/android_arm64.patch +++ b/docker/base/android_arm64.patch @@ -1,4 +1,4 @@ -From 844d3e17e89af37ce4b851b73e4c2a903f8dcfd4 Mon Sep 17 00:00:00 2001 +From 254e42a0d1fc8f7281403218fde7252079b4310f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Sun, 13 Dec 2015 21:04:06 +0200 Subject: [PATCH] runtime: init argc/argv for android/arm64 c-shared @@ -9,14 +9,14 @@ arm64 architecture. Change-Id: I851958b4b0944ec79d7a1426a3bb2cfc31746797 --- - src/runtime/rt0_android_arm64.s | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + src/runtime/rt0_android_arm64.s | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/src/runtime/rt0_android_arm64.s b/src/runtime/rt0_android_arm64.s -index 7291476..5341a25 100644 +index 7291476..582fc5a 100644 --- a/src/runtime/rt0_android_arm64.s +++ b/src/runtime/rt0_android_arm64.s -@@ -8,6 +8,25 @@ TEXT _rt0_arm64_android(SB),NOSPLIT,$-8 +@@ -8,6 +8,18 @@ TEXT _rt0_arm64_android(SB),NOSPLIT,$-8 MOVD $_rt0_arm64_linux(SB), R4 B (R4) @@ -31,17 +31,10 @@ index 7291476..5341a25 100644 +DATA _rt0_arm64_android_argv+0x00(SB)/8,$_rt0_arm64_android_argv0(SB) +DATA _rt0_arm64_android_argv+0x08(SB)/8,$0 +DATA _rt0_arm64_android_argv+0x10(SB)/8,$0 -+DATA _rt0_arm64_android_argv+0x18(SB)/8,$15 // AT_PLATFORM -+DATA _rt0_arm64_android_argv+0x20(SB)/8,$_rt0_arm64_android_auxv0(SB) -+DATA _rt0_arm64_android_argv+0x28(SB)/8,$16 // AT_HWCAP -+DATA _rt0_arm64_android_argv+0x30(SB)/8,$0 -+GLOBL _rt0_arm64_android_argv(SB),NOPTR,$0x38 ++GLOBL _rt0_arm64_android_argv(SB),NOPTR,$0x18 + +DATA _rt0_arm64_android_argv0(SB)/8, $"gojni" +GLOBL _rt0_arm64_android_argv0(SB),RODATA,$8 -+ -+DATA _rt0_arm64_android_auxv0(SB)/8, $"v8a" -+GLOBL _rt0_arm64_android_auxv0(SB),RODATA,$8 -- 2.5.0 diff --git a/docker/base/build.sh b/docker/base/build.sh index 2a41330..8bcd9de 100644 --- a/docker/base/build.sh +++ b/docker/base/build.sh @@ -253,6 +253,7 @@ for TARGET in $TARGETS; do jni=`mktemp -d` cp `find /build-android-aar | grep '\.h$' | head -n 1` $jni/$NAME.h sed -i -e 's|__complex|complex|g' $jni/$NAME.h + sed -i -e 's|_Complex|complex|g' $jni/$NAME.h echo -e "%module $title\n%{\n#include \"$NAME.h\"\n%}\n%pragma(java) jniclasscode=%{\nstatic {\nSystem.loadLibrary(\"$NAME\");\n}\n%}\n%include \"$NAME.h\"" > $jni/$NAME.i mkdir -p $jni/${package//.//}