linphone-iphone/submodules/build/builders.d/x264.patch at 0ad82b4cff34bd2c2cabdc1e360230224eb896f2 - mirrors/linphone-iphone - Witine

mirrors/linphone-iphone

mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00

Jehan Monnier ddeaddf92d Merge remote-tracking branch 'public/master' into dev_videoios

IOS migration

Conflicts:
	.gitignore
	.gitmodules
	linphone-Info.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/iphone-config.site
	submodules/externals/osip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone

2011-10-19 11:36:27 +02:00

12 lines

308 B

Diff

Raw Blame History

 diff --git a/common/arm/asm.S b/common/arm/asm.S
 index 8e70403..259bb92 100644
 --- a/common/arm/asm.S
 +++ b/common/arm/asm.S
@@ -47,6 +47,7 @@ ELF     .eabi_attribute 25, \val
          .endm
          .macro function name
 +	.align 2
          .global EXTERN_ASM\name
  EXTERN_ASM\name:
  ELF     .hidden \name