开放原子开发者工作坊

diff --git a/libvpx.gyp b/libvpx.gyp
index 4f8cb2b..4eb6866 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -74,7 +74,7 @@
# support for neon and hide it behind Android cpu-features.
'includes': ['libvpx_srcs_arm_neon_cpu_detect_intrinsics.gypi', ],
}],
- [ '(target_arch != "arm" and target_arch != "armv7") and \
+ [ '(target_arch != "arm" and target_arch != "armv7" and target_arch != "armv64") and \
(target_arch != "mipsel" and target_arch != "mips64el")', {
'targets': [
{
@@ -217,7 +217,7 @@
},
],
# 'libvpx' target for ARM builds.
- [ '(target_arch=="arm" or target_arch=="armv7") ', {
+ [ '(target_arch=="arm" or target_arch=="armv7" or target_arch=="armv64") ', {
'targets': [
{
# This libvpx target contains both encoder and decoder.
@@ -453,7 +453,7 @@
# intermediates-dir-for macro.
'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
}],
- ['(target_arch=="arm" or target_arch=="armv7")', {
+ ['(target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64")', {
'output_format': 'gas',
}, {
'output_format': 'rvds',
diff --git a/source/libvpx/build/make/obj_int_extract.c b/source/libvpx/build/make/obj_int_extract.c
index 2e50f38..7d4f0b8 100644
--- a/source/libvpx/build/make/obj_int_extract.c
+++ b/source/libvpx/build/make/obj_int_extract.c
@@ -97,8 +97,10 @@ int parse_macho(uint8_t *base_buf, size_t sz, output_fmt_t mode) {
bits = 64;
buf += sizeof(struct mach_header_64);
} else {
- log_msg("Bad cputype for object file. Currently only tested for CPU_TYPE_X86_64.\n");
- goto bail;
+ //log_msg("Bad cputype for object file. Currently only tested for CPU_TYPE_X86_64.\n");
+ //goto bail;
+ bits = 64;
+ buf += sizeof(struct mach_header_64);
}
} else {
log_msg("Bad magic number for object file. 0x%x or 0x%x expected, 0x%x found.\n",