Chromium changes for static linking ffmpeg

third_party/x86inc/x86inc.asm

 ;*****************************************************************************
 ;* x86inc.asm
 ;*****************************************************************************
 ;* Copyright (C) 2005-2011 x264 project
 ;*
 ;* Authors: Loren Merritt <lorenm@u.washington.edu>
 ;*          Anton Mitrofanov <BugMaster@narod.ru>
 ;*          Jason Garrett-Glaser <darkshikari@gmail.com>
 ;*
 ;* Permission to use, copy, modify, and/or distribute this software for any
@@ skipping 494 matching lines @@
 ;=============================================================================
 
 %assign function_align 16
 
 ; Symbol prefix for C linkage
 %macro cglobal 1-2+
     %xdefine %1 mangle(program_name %+ _ %+ %1)
     %xdefine %1.skip_prologue %1 %+ .skip_prologue
     %ifidn __OUTPUT_FORMAT__,elf
         global %1:function hidden
+    %elifidn __OUTPUT_FORMAT__,macho64
+        global %1:function hidden

[M-A Ruel, 2015/05/15 23:51:29]

This change doesn't seem related with the rest.

[DaleCurtis, 2015/05/15 23:57:45]

Yeah this should be dropped, only the x86inc.asm inside of ffmpeg needs
tweaking.

[chcunningham, 2015/05/16 04:36:26]

Dropped.

     %else
         global %1
     %endif
     align function_align
     %1:
     RESET_MM_PERMUTATION ; not really needed, but makes disassembly somewhat nicer
     %assign stack_offset 0
     %if %0 > 1
         PROLOGUE %2
     %endif
@@ skipping 470 matching lines @@
 %if gprsize == 8
   movq      %1, %2
 %else
   movd      %1, %2
 %endif
 %endmacro
 
 %endif  ; CHROMIUM
 
 %endif  ; THIRD_PARTY_X86INC_X86INC_ASM_