projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0eae920
)
x86inc: fully concatenate tokens to fix macro expansion for nasm
author
Janne Grunau
<janne-libav@jannau.net>
Thu, 13 Dec 2012 21:42:11 +0000
(22:42 +0100)
committer
Janne Grunau
<janne-libav@jannau.net>
Thu, 13 Dec 2012 22:57:09 +0000
(23:57 +0100)
Fixes build errors with nasm introduced in
6f40e9f070f7
for stack
memory alignment. Noticed by BugMaster.
libavutil/x86/x86inc.asm
patch
|
blob
|
history
diff --git
a/libavutil/x86/x86inc.asm
b/libavutil/x86/x86inc.asm
index
de0f22c
..
60d05f4
100644
(file)
--- a/
libavutil/x86/x86inc.asm
+++ b/
libavutil/x86/x86inc.asm
@@
-153,10
+153,10
@@
CPUNOP amdnop
%define r%1mp %2
%elif ARCH_X86_64 ; memory
%define r%1m [rstk + stack_offset + %3]
- %define r%1mp qword r %+ %1m
+ %define r%1mp qword r %+ %1
%+
m
%else
%define r%1m [rstk + stack_offset + %3]
- %define r%1mp dword r %+ %1m
+ %define r%1mp dword r %+ %1
%+
m
%endif
%define r%1 %2
%endmacro