ref: 46f1c898c6b3c2d5977f2e8d4b7fbc55f09c3108
parent: dacd22d695152105dc9dc93776513247a27371dc
parent: 38d2d64ede73b0352e090f95012b31a0d224fa88
author: zhilwang <zhilwang@cisco.com>
date: Mon Aug 11 04:40:27 EDT 2014
Merge pull request #1257 from mstorsjo/fixup-apple-assembly Explicitly add .syntax unified when building for iOS
--- a/codec/common/arm/arm_arch_common_macro.S
+++ b/codec/common/arm/arm_arch_common_macro.S
@@ -30,6 +30,8 @@
*
*/
+.syntax unified
+
#ifdef __APPLE__
.macro WELS_ASM_FUNC_BEGIN
@@ -44,7 +46,6 @@
.endm
#else
-.syntax unified
.section .note.GNU-stack,"",%progbits // Mark stack as non-executable
.text
--- a/codec/common/arm/deblocking_neon.S
+++ b/codec/common/arm/deblocking_neon.S
@@ -855,7 +855,7 @@
beq bs_nzc_check_jump0
sub r6, $0, $2, lsl #4
- sub r6, $2, lsl #3
+ sub r6, r6, $2, lsl #3
add r6, #12
vld1.32 d3[1], [r6]