third_party/x86inc/x86inc.asm - Issue 1141703002: Chromium changes for static linking ffmpeg

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/x86inc/x86inc.asm

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tweaking our x86inc.asm Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/x86inc/x86inc.asm

diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm

index 7c57f8feb68f47dbfd843f4176e8e43a4460bfe3..5ebb58e51f2e3890e11549cdac4252667596f041 100644

--- a/third_party/x86inc/x86inc.asm

+++ b/third_party/x86inc/x86inc.asm

@@ -512,6 +512,8 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28]

%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 i

chcunningham 2015/05/16 04:36:26 Dropped.

%else

global %1

%endif