--- portab.h	2004/06/12 13:02:12	1.53
+++ portab.h	2006/07/10 15:05:30	1.54.2.1
@@ -21,7 +21,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: portab.h,v 1.53 2004/06/12 13:02:12 edgomez Exp $
+ * $Id: portab.h,v 1.54.2.1 2006/07/10 15:05:30 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -151,7 +151,7 @@
 /*----------------------------------------------------------------------------
   | msvc x86 specific macros/functions
  *---------------------------------------------------------------------------*/
-#    if defined(ARCH_IS_IA32)
+#    if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 #        define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
 
 static __inline int64_t read_counter(void)
@@ -234,7 +234,7 @@
 /*----------------------------------------------------------------------------
   | gcc IA32 specific macros/functions
  *---------------------------------------------------------------------------*/
-#    if defined(ARCH_IS_IA32)
+#    if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 #        define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) );
 
 static __inline int64_t read_counter(void)
@@ -291,8 +291,8 @@
  *---------------------------------------------------------------------------*/
 #    elif defined(ARCH_IS_IA64)
 #        define BSWAP(a)  __asm__ __volatile__ \
-	("mux1 %1 = %0, @rev" ";;" \
-	 "shr.u %1 = %1, 32" : "=r" (a) : "r" (a));
+ 	("mux1 %0 = %1, @rev" ";;" \
+ 	 "shr.u %0 = %0, 32" : "=r" (a) : "r" (a));
 
 static __inline int64_t read_counter(void)
 {