[x264-devel] [PATCH 5/7] Enable asm routines using NASM on OS/2

[KO Myung-Hun]

---
 common/x86/x86inc.asm |    3 +++
 configure             |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/common/x86/x86inc.asm b/common/x86/x86inc.asm
index d56c312..37851bf 100644
--- a/common/x86/x86inc.asm
+++ b/common/x86/x86inc.asm
@@ -57,12 +57,15 @@
 ; Name of the .rodata section.
 ; Kludge: Something on OS X fails to align .rodata even given an align attribute,
 ; so use a different read-only section.
+; Kludge: aout format does not support .rodata neither align, so use .data.
 %macro SECTION_RODATA 0-1 16
     %ifidn __OUTPUT_FORMAT__,macho64
         SECTION .text align=%1
     %elifidn __OUTPUT_FORMAT__,macho
         SECTION .text align=%1
         fakegot:
+    %elifidn __OUTPUT_FORMAT__,aout
+        SECTION .data
     %else
         SECTION .rodata align=%1
     %endif
diff --git a/configure b/configure
index 8ff2e5a..6e3ee5b 100644
--- a/configure
+++ b/configure
@@ -373,9 +373,12 @@ case $host_cpu in
         elif [ "$SYS" = MINGW ]; then
             ASFLAGS="$ASFLAGS -f win32 -DPREFIX"
             LDFLAGS="$LDFLAGS -Wl,--large-address-aware"
+        elif [ "$SYS" = OS2 ]; then
+            ASFLAGS="$ASFLAGS -f aout -DPREFIX"
         else
             ASFLAGS="$ASFLAGS -f elf"
         fi
+        as_check || AS="nasm"
         ;;
     x86_64)
         ARCH="X86_64"
-- 
1.7.3.2