[x265] [PATCH 15 of 20] x86inc: Sync minor changes from ffmpeg/libav

[vignesh at multicorewareinc.com]

# HG changeset patch
# User Vignesh Vijayakumar
# Date 1496755222 -19800
#      Tue Jun 06 18:50:22 2017 +0530
# Node ID 27cf65f6bd8a45def62366fc004b42ca270d81ec
# Parent  56c0d472d5b64500fce96fc4c41c5b234479009a
x86inc: Sync minor changes from ffmpeg/libav

diff -r 56c0d472d5b6 -r 27cf65f6bd8a source/common/x86/x86inc.asm
--- a/source/common/x86/x86inc.asm	Tue Jun 06 17:14:06 2017 +0530
+++ b/source/common/x86/x86inc.asm	Tue Jun 06 18:50:22 2017 +0530
@@ -135,6 +135,7 @@
     %define r%1w %2w
     %define r%1b %2b
     %define r%1h %2h
+    %define %2q %2
     %if %0 == 2
         %define r%1m  %2d
         %define r%1mp %2
@@ -984,13 +985,13 @@
 
 ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't
 %macro call 1
-    call_internal %1, %1 %+ SUFFIX
+    call_internal %1 %+ SUFFIX, %1
 %endmacro
 %macro call_internal 2
-    %xdefine %%i %1
-    %ifndef cglobaled_%1
-        %ifdef cglobaled_%2
-            %xdefine %%i %2
+    %xdefine %%i %2
+    %ifndef cglobaled_%2
+        %ifdef cglobaled_%1
+            %xdefine %%i %1
         %endif
     %endif
     call %%i