@@ -488,11 +488,11 @@
 {
 #if defined(OF_HAVE_BUILTIN_BSWAP16)
 	return __builtin_bswap16(i);
 #elif (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	__asm__ (
-	    "xchgb	%h0, %b0"
+	    "xchg{b}	{ %h0, %b0 | %b0, %h0 }"
 	    : "=Q"(i)
 	    : "0"(i)
 	);
 #elif defined(OF_POWERPC) && defined(__GNUC__)
 	__asm__ (
@@ -556,13 +556,13 @@
 	    : "=r"(i)
 	    : "0"(i)
 	);
 #elif defined(OF_X86) && defined(__GNUC__)
 	__asm__ (
-	    "bswap	%%eax\n\t"
-	    "bswap	%%edx\n\t"
-	    "xchgl	%%eax, %%edx"
+	    "bswap	{%%}eax\n\t"
+	    "bswap	{%%}edx\n\t"
+	    "xchg{l}	{ %%eax, %%edx | edx, eax }"
 	    : "=A"(i)
 	    : "0"(i)
 	);
 #else
 	i = (uint64_t)OFByteSwap32NonConst(