Merge "Allow specifying a different prefix in x86inc.asm"

d61c1ea6 · Johann · Gerrit Code Review · d011a8a4 · b09ac154 · d61c1ea6
Commit d61c1ea6 authored Apr 15, 2015 by Johann Committed by Gerrit Code Review Apr 15, 2015
--- a/third_party/x86inc/README.libvpx
+++ b/third_party/x86inc/README.libvpx
@@ -9,3 +9,4 @@ defines that help automatically allow assembly to work cross-platform.

 Local Modifications:
 Some modifications to allow PIC to work with x86inc.
+Conditionally define program_name to allow overriding.
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -36,7 +36,9 @@

 %include "vpx_config.asm"

+%ifndef program_name
 %define program_name vp9
+%endif


 %define UNIX64 0