Use -marm

Cedric Fung · Cedric Fung · commit 0142035aeaf4 · 2012-09-13T03:14:50.000+08:00
diff --git a/FFmpeg-Android.sh b/FFmpeg-Android.sh
@@ -2,7 +2,7 @@
 #
 # FFmpeg-Android, a bash script to build FFmpeg for Android.
 #
-# Copyright (c) 2012 Cedric Fung <wolfplanet@gmail.com>
+# Copyright (c) 2012 Cedric Fung <root@vec.io>
 #
 # FFmpeg-Android will build FFmpeg for Android automatically,
 # with patches from VPlayer's Android version <https://vplayer.net/>.
@@ -52,7 +52,7 @@ export CC="ccache arm-linux-androideabi-gcc"
 export LD=arm-linux-androideabi-ld
 export AR=arm-linux-androideabi-ar
 
-CFLAGS="-O3 -Wall -mthumb -pipe -fpic -fasm \
+CFLAGS="-O3 -Wall -marm -pipe -fpic -fasm \
   -finline-limit=300 -ffast-math \
   -fstrict-aliasing -Werror=strict-aliasing \
   -fmodulo-sched -fmodulo-sched-allow-regmoves \

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# FFmpeg-Android, a bash script to build FFmpeg for Android.`
`4`	`4`	`#`
`5`		`-# Copyright (c) 2012 Cedric Fung <[email protected]>`
	`5`	`+# Copyright (c) 2012 Cedric Fung <[email protected]>`
`6`	`6`	`#`
`7`	`7`	`# FFmpeg-Android will build FFmpeg for Android automatically,`
`8`	`8`	`# with patches from VPlayer's Android version <https://vplayer.net/>.`
`@@ -52,7 +52,7 @@ export CC="ccache arm-linux-androideabi-gcc"`
`52`	`52`	`export LD=arm-linux-androideabi-ld`
`53`	`53`	`export AR=arm-linux-androideabi-ar`
`54`	`54`
`55`		`-CFLAGS="-O3 -Wall -mthumb -pipe -fpic -fasm \`
	`55`	`+CFLAGS="-O3 -Wall -marm -pipe -fpic -fasm \`
`56`	`56`	`-finline-limit=300 -ffast-math \`
`57`	`57`	`-fstrict-aliasing -Werror=strict-aliasing \`
`58`	`58`	`-fmodulo-sched -fmodulo-sched-allow-regmoves \`