X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/f1bb5558190eca2be96c7b43c5d030b60034db7f..4db955e1d8c2d0d7545b6f53eac20fa7357428be:/sys/cpu/i386/include/endian.h

diff --git a/sys/cpu/i386/include/endian.h b/sys/cpu/i386/include/endian.h
index c9d6bdbd6b..3137a20e7c 100644
--- a/sys/cpu/i386/include/endian.h
+++ b/sys/cpu/i386/include/endian.h
@@ -34,11 +34,11 @@
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
  * $FreeBSD: src/sys/i386/include/endian.h,v 1.18 1999/12/29 04:33:01 peter Exp $
- * $DragonFly: src/sys/cpu/i386/include/endian.h,v 1.6 2004/11/15 08:16:02 joerg Exp $
+ * $DragonFly: src/sys/cpu/i386/include/endian.h,v 1.8 2007/11/07 17:42:50 dillon Exp $
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
+#ifndef _CPU_ENDIAN_H_
+#define	_CPU_ENDIAN_H_
 
 #include <sys/cdefs.h>
 #include <machine/stdint.h>
@@ -99,26 +99,11 @@
 
 #if defined(__GNUC__) || defined(__INTEL_COMPILER_with_DragonFly_endian)
 
-#if (defined(_KERNEL)  && !defined(I386_CPU) && \
-	(defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU))) || \
-    defined(__i486__) || defined(__i586__) || defined(__i686__) || \
-    defined(__k6__) || defined(__athlon__) || defined(__k8__) || \
-    defined(__pentium4__)
-
 #define __byte_swap32_var(x) \
 	__extension__ ({ register __uint32_t __X = (x); \
 	   __asm ("bswap %0" : "+r" (__X)); \
 	   __X; })
 
-#else /* !I386_CPU */
-
-#define __byte_swap32_var(x) \
-	__extension__ ({ register __uint32_t __X = (x); \
-	   __asm ("xchgb %h0, %b0\n\trorl $16, %0\n\txchgb %h0, %b0" \
-	       : "+q" (__X)); \
-	   __X; })
-#endif /* !I386_CPU */
-
 #define __byte_swap16_var(x) \
 	__extension__ ({ register __uint16_t __X = (x); \
 	   __asm ("xchgb %h0, %b0" : "+q" (__X)); \
@@ -180,4 +165,4 @@ __bswap64(__uint64_t _x)
 
 __END_DECLS
 
-#endif /* !_MACHINE_ENDIAN_H_ */
+#endif /* !_CPU_ENDIAN_H_ */