Merge branch 'cg_merges_20130822a' into bfgminer

sha256_sse2_amd64.c

@@ -43,7 +43,7 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = {
 };
 
 
-const uint32_t sha256_init[8]__asm__("sha256_init")__attribute__((aligned(0x100))) =
+const uint32_t sha256_init_sse2[8]__asm__("sha256_init_sse2")__attribute__((aligned(0x100))) =
 {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
 
 __m128i g_4sha256_k[64];

x86_64/sha256_xmm_amd64.asm

@@ -41,7 +41,7 @@ BITS 64
 %define SHA_ROUND_LOOP_UNROLL   16
 
 extern sha256_consts_m128i
-extern sha256_init
+extern sha256_init_sse2
 
 global sha256_sse2_64_new
 
@@ -314,7 +314,7 @@ sha256_sse2_64_new:
     movdqa    [hash1+7*16], rH
 
     mov       data, hash1
-    mov       init, qword sha256_init
+    mov       init, qword sha256_init_sse2
 
     SHA_256