bring over build fix from xorg tree

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index ad14abc301645d7bc4071cb2c4a25ca12d19bcd5..839062921ba3b69d32a49fb1ec7032f78fa906aa 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -352,6 +352,7 @@ do {                                                \
  * From linux kernel i386 header files, copes with odd sizes better
  * than COPY_DWORDS would:
  */
+#ifdef __i386__
 static __inline__ void * __memcpy(void * to, const void * from, size_t n)
 {
    int d0, d1, d2;
@@ -369,6 +370,9 @@ static __inline__ void * __memcpy(void * to, const void * from, size_t n)
       : "memory");
    return (to);
 }
+#else
+#define __memcpy(a,b,c) memcpy(a,b,c)
+#endif