commit 2f68124f26e54233db41b462a257dabc48e5c32b
author Jens Axboe <jaxboe@fusionio.com> Thu Oct 21 08:15:59 2010 +0200
committer Jens Axboe <jaxboe@fusionio.com> Thu Oct 21 08:15:59 2010 +0200
tree 19bd597e4968c8fbc80fe67f36dab4f9bb67a42a
parent 5e0baa7f423995c4f75070d6a2ee56619e195a36

A few fixes for 32-bit compiles

- Change the HAVE_SSE to HAVE_SSE4_2 and only provide it on
  x86-64.
- Cast two values that otherwise cause the compiler to warn on 32-bit

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

arch/arch-x86.h

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index bffd1dd..2e803cb 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -48,7 +48,6 @@
 }
 
 #define ARCH_HAVE_FFZ
-#define ARCH_HAVE_SSE
 #define ARCH_HAVE_CPU_CLOCK
 
 #endif

arch/arch-x86_64.h

diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index 3ea8070..6dbeee0 100644
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -48,7 +48,7 @@
 }
 
 #define ARCH_HAVE_FFZ
-#define ARCH_HAVE_SSE
+#define ARCH_HAVE_SSE4_2
 #define ARCH_HAVE_CPU_CLOCK
 
 #endif

crc/crc32c-intel.c

diff --git a/crc/crc32c-intel.c b/crc/crc32c-intel.c
index 77d6df4..969a037 100644
--- a/crc/crc32c-intel.c
+++ b/crc/crc32c-intel.c
@@ -18,7 +18,7 @@
  * Volume 2A: Instruction Set Reference, A-M
  */
 
-#ifdef ARCH_HAVE_SSE
+#ifdef ARCH_HAVE_SSE4_2
 
 #if BITS_PER_LONG == 64
 #define REX_PRE "0x48, "

crc/crc32c.h

diff --git a/crc/crc32c.h b/crc/crc32c.h
index 50f3665..596fd6c 100644
--- a/crc/crc32c.h
+++ b/crc/crc32c.h
@@ -22,7 +22,7 @@
 
 extern uint32_t crc32c(unsigned char const *, unsigned long);
 
-#ifdef ARCH_HAVE_SSE
+#ifdef ARCH_HAVE_SSE4_2
 extern uint32_t crc32c_intel(unsigned char const *, unsigned long);
 extern int crc32c_intel_works(void);
 #else

engines/binject.c

diff --git a/engines/binject.c b/engines/binject.c
index 0bdaa24..f7e56eb 100644
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -146,7 +146,7 @@
 		for (i = 0; i < events; i++) {
 			struct b_user_cmd *buc = (struct b_user_cmd *) buf + i;
 
-			bd->events[ev_index] = (struct io_u *) buc->usr_ptr;
+			bd->events[ev_index] = (struct io_u *) (unsigned long) buc->usr_ptr;
 			ev_index++;
 		}
 	}

verify.c

diff --git a/verify.c b/verify.c
index f537553..ea1a911 100644
--- a/verify.c
+++ b/verify.c
@@ -501,7 +501,7 @@
 	log_err("trim: verify failed at file %s offset %llu, length %lu"
 		", block offset %lu\n",
 			io_u->file->file_name, io_u->offset, io_u->buflen,
-			(p - io_u->buf));
+			(unsigned long) (p - io_u->buf));
 	return ret;
 }