Merge branch '20130530_portablecpu' into bfgminer

configure.ac

@@ -540,6 +540,7 @@ fi
 if test "x$has_yasm" = "xfalse" ; then
   AC_MSG_NOTICE([yasm is required for the assembly algorithms. They will be skipped.])
 else
+	AC_DEFINE([HAVE_YASM], [1], [Defined to 1 if yasm is being used])
 	if test "x$have_win32$have_cygwin" != "xfalsefalse"; then
 		if test "x$have_x86_64" = xtrue; then
 			YASM_FMT="win64"

driver-cpu.h

@@ -18,7 +18,7 @@
 #define WANT_ALTIVEC_4WAY 1
 #endif
 
-#ifdef __i386__
+#if defined(__i386__) && defined(HAVE_YASM)
 #define WANT_X8632_SSE2 1
 #endif
 
@@ -26,11 +26,11 @@
 #define WANT_VIA_PADLOCK 1
 #endif
 
-#ifdef __x86_64__
+#if defined(__x86_64__) && defined(HAVE_YASM)
 #define WANT_X8664_SSE2 1
 #endif
 
-#ifdef __x86_64__
+#if defined(__x86_64__) && defined(HAVE_YASM)
 #define WANT_X8664_SSE4 1
 #endif
 

x86_64/sha256_sse4_amd64.asm

@@ -166,8 +166,7 @@ LAB_LOOP:
 
 %macro	lab_loop_blk 0
 	movntdqa	xmm6, [data+rax*4]
-	movntdqa	xmm1, g_4sha256_k[rax*4]
-	paddd	xmm6, xmm1
+	paddd	xmm6, g_4sha256_k[rax*4]
 	add	rax, 4
 
 	paddd	xmm6, xmm10	; +h

x86_64/sha256_xmm_amd64.asm

@@ -314,7 +314,7 @@ sha256_sse2_64_new:
     movdqa    [hash1+7*16], rH
 
     mov       data, hash1
-    mov       init, sha256_init
+    mov       init, qword sha256_init
 
     SHA_256