diff --git a/ChangeLog b/ChangeLog
index f066a88491..dd8fcc4cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-15  Chung-Lin Tang  <cltang@codesourcery.com>
+
+	* string/endian.h: Add !__ASSEMBLER__ condition for including
+	conversion interfaces.
+
 2012-06-15  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14241]
diff --git a/string/endian.h b/string/endian.h
index 0c293f6379..51084f1e9c 100644
--- a/string/endian.h
+++ b/string/endian.h
@@ -55,7 +55,7 @@
 #endif
 
 
-#ifdef __USE_BSD
+#if defined __USE_BSD && !defined __ASSEMBLER__
 /* Conversion interfaces.  */
 # include <bits/byteswap.h>