x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Tue Nov 25 16:30:39 2008 -0800| [a7fd9f5da062de323ae89f9a71ede03bfd6ddb6a] | committer: Jason Garrett-Glaser
Remove nasm support
Nasm won't correctly parse the SSE4 code introduced a few revisions ago, so we're removing support.
Users should upgrade to yasm 0.6.1 or later.
> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=a7fd9f5da062de323ae89f9a71ede03bfd6ddb6a
---
common/x86/quant-a.asm | 2 +-
configure | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/common/x86/quant-a.asm b/common/x86/quant-a.asm
index 80cf5b5..d55d17e 100644
--- a/common/x86/quant-a.asm
+++ b/common/x86/quant-a.asm
@@ -558,7 +558,7 @@ cglobal x264_decimate_score64_%1, 1,5
xor r3, -1
je .tryret
xor r4, -1
-.cont
+.cont:
or r0, r2
jne .ret9 ;r0 is zero at this point, so we don't need to zero it
.loop:
diff --git a/configure b/configure
index 6c5f949..eb51091 100755
--- a/configure
+++ b/configure
@@ -246,7 +246,6 @@ case $host_cpu in
else
ASFLAGS="$ASFLAGS -f elf"
fi
- as_check || AS="nasm"
;;
x86_64)
ARCH="X86_64"
@@ -302,12 +301,12 @@ if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" \)
fi
if [ $asm = yes -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
- if as_check "pabsw xmm0, xmm0" ; then
+ if as_check "pinsrd xmm0, [esp], 0" ; then
CFLAGS="$CFLAGS -DHAVE_MMX"
else
- VER=`([ $AS == nasm ] && nasm -v || $AS --version || echo no assembler) 2>$DEVNULL | head -n 1`
+ VER=`($AS --version || echo no assembler) 2>$DEVNULL | head -n 1`
echo "Found $VER"
- echo "Minimum version is yasm-0.6.1 or nasm-2.0"
+ echo "Minimum version is yasm-0.6.1"
echo "If you really want to compile without asm, configure with --disable-asm."
exit 1
fi