generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix iOS assembly compile error.

Browse Source 
In the roll of
https://webrtc-codereview.appspot.com/13369007
the fix in transform_neon.S was incorrectly removed
assuming it was only affecting Android when rolling to
265795. This CL fixes the iOS build when rolled to
266514.

Error looks like:
[893/2157] CC obj/webrtc/modules/audio_coding/codecs/isac/main/source/iSAC.entropy_coding.o
FAILED: /Volumes/data/b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang -MMD -MF obj/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_neon.transform_neon.o.d -DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME -DDISABLE_NACL -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_CONFIGURATION_POLICY -DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY -DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DENABLE_EGLIMAGE=1 -DCLD_VERSION=1 -DENABLE_SPELLCHECK=1 -DDISABLE_FTP_SUPPORT=1 -DWEBRTC_RESTRICT_LOGGING -DWEBRTC_MODULE_UTILITY_VIDEO -DWEBRTC_ARCH_ARM -DWEBRTC_ARCH_ARM_V7 -DWEBRTC_ARCH_ARM_NEON -DWEBRTC_POSIX -DWEBRTC_MAC -DWEBRTC_IOS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DNS_BLOCK_ASSERTIONS=1 -D_FORTIFY_SOURCE=2 -I../.. -I../.. -I../../webrtc -I../../webrtc/common_audio/resampler/include -I../../webrtc/common_audio/signal_processing/include -I../../webrtc/common_audio/vad/include -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk -Os -gdwarf-2 -fvisibility=hidden -Werror -Wnewline-eof -miphoneos-version-min=6.0 -arch armv7 -Wall -Wendif-labels -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wheader-hygiene -Wno-c++11-narrowing -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-deprecated-register -Wno-absolute-value -Wno-selector-type-mismatch -std=c99 -fcolor-diagnostics  -c ../../webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.S -o obj/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_neon.transform_neon.o
../../webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.S:45:11: error: immediate expression for mov requires :lower16: or :upper16
  mov r6, #(WebRtcIsacfix_kSinTab1 - WebRtcIsacfix_kCosTab1)
          ^
../../webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.S:458:11: error: immediate expression for mov requires :lower16: or :upper16
  mov r2, #(WebRtcIsacfix_kSinTab1 - WebRtcIsacfix_kCosTab1)
in
http://build.chromium.org/p/client.webrtc/builders/iOS%20Release/builds/911/steps/compile/logs/stdio

TBR=ajm
TEST=ios trybots passing tryjob based on r6010.
BUG=

Review URL: https://webrtc-codereview.appspot.com/12439005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6012 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-04-29 10:25:30 +00:00
parent 060b84b3bb
commit 97e67cb476
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.S
View File

@ -42,7 +42,11 @@ DEFINE_FUNCTION WebRtcIsacfix_Time2SpecNeon
add r5, sp, #(16 + FRAMESAMPLES * 2) @ tmpimQ16;
adr r9, WebRtcIsacfix_kCosTab1
#if defined(__APPLE__)
mov r6, #:lower16:(WebRtcIsacfix_kSinTab1 - WebRtcIsacfix_kCosTab1)
#else
mov r6, #(WebRtcIsacfix_kSinTab1 - WebRtcIsacfix_kCosTab1)
#endif
add r10, r9, r6 @ WebRtcIsacfix_kSinTab1
vmov.u32 q14, #0 @ Initialize the maximum values for tmpInIm.
@ -455,7 +459,12 @@ TransformAndFindMax:
bgt TransformAndFindMax
adr r10, WebRtcIsacfix_kSinTab1
#if defined(__APPLE__)
mov r2, #:lower16:(WebRtcIsacfix_kSinTab1 - WebRtcIsacfix_kCosTab1)
#else
mov r2, #(WebRtcIsacfix_kSinTab1 - WebRtcIsacfix_kCosTab1)
#endif
sub r11, r10, r2 @ WebRtcIsacfix_kCosTab1
@ Find the maximum value in the Neon registers