diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eca3b52f06..ae37a863da 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-20  Yao Qi  <yao@codesourcery.com>
+
+	* ctf.c (ctf_save_metadata_header): Define macro HOST_ENDIANNESS
+	and write it to CTF metadata.
+
 2013-03-19  Corinna Vinschen  <vinschen@redhat.com>
 
 	* windows-nat.c (handle_output_debug_string): Change type of n to
diff --git a/gdb/ctf.c b/gdb/ctf.c
index d2ff862dd3..117f72a770 100644
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -218,9 +218,17 @@ ctf_save_metadata_header (struct trace_write_handler *handler)
 			   " := uint64_t;\n");
   ctf_save_write_metadata (handler, "\n");
 
+  /* Get the byte order of the host and write CTF data in this byte
+     order.  */
+#if WORDS_BIGENDIAN
+#define HOST_ENDIANNESS "be"
+#else
+#define HOST_ENDIANNESS "le"
+#endif
+
   ctf_save_write_metadata (handler, metadata_fmt,
 			   CTF_SAVE_MAJOR, CTF_SAVE_MINOR,
-			   BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be");
+			   HOST_ENDIANNESS);
   ctf_save_write_metadata (handler, "\n");
 }