commit e963651749e7fdb0576eb21af569ccc225ff3054
author Johann <johannkoenig@google.com> Wed Apr 01 08:57:52 2020 +0900
committer Johann Koenig <johannkoenig@google.com> Wed Apr 01 01:43:28 2020 +0000
tree 1ba3dcbdf7defb3a83e34d41f8e56a28b7fdd7a6
parent daa7869b1c74dd711c14ef94d4585860da251ac4

nasm: require 2.14 with -DCHROMIUM

Cherry-pick libvpx b3d12b3c

BUG=webm:1679

Change-Id: Ib471ab66e79540f00e597a51b4f6279727c51d06

aom_ports/x86_abi_support.asm

diff --git a/aom_ports/x86_abi_support.asm b/aom_ports/x86_abi_support.asm
index 0e7c262..6448990 100644
--- a/aom_ports/x86_abi_support.asm
+++ b/aom_ports/x86_abi_support.asm
@@ -122,6 +122,13 @@
 ;    http://www.tortall.net/projects/yasm/ticket/236
 ;
 %ifdef CHROMIUM
+  %ifdef __NASM_VER__
+    %if __NASM_VERSION_ID__ < 0x020e0000 ; 2.14
+      ; nasm < 2.14 does not support :private_extern directive
+      %fatal Must use nasm 2.14 or newer
+    %endif
+  %endif
+
   %ifidn   __OUTPUT_FORMAT__,elf32
     %define PRIVATE :hidden
   %elifidn __OUTPUT_FORMAT__,elf64