diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 06a493f503e..ba3c9f3392f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.trace/tfile.c(add_memory_block): Store address in unsigned
+	type.
+
 2011-05-13  Doug Evans  <dje@google.com>
 
 	* gdb.python/py-objfile-script.exp: New file.
diff --git a/gdb/testsuite/gdb.trace/tfile.c b/gdb/testsuite/gdb.trace/tfile.c
index e9c1831fda8..11c79d9b12a 100644
--- a/gdb/testsuite/gdb.trace/tfile.c
+++ b/gdb/testsuite/gdb.trace/tfile.c
@@ -49,13 +49,13 @@ void
 add_memory_block (char *addr, int size)
 {
   short short_x;
-  long long ll_x;
+  unsigned long long ll_x;
 
   *((char *) trptr) = 'M';
   trptr += 1;
-  ll_x = (long) addr;
-  memcpy (trptr, &ll_x, sizeof (long long));
-  trptr += sizeof (long long);
+  ll_x = (unsigned long) addr;
+  memcpy (trptr, &ll_x, sizeof (unsigned long long));
+  trptr += sizeof (unsigned long long);
   short_x = size;
   memcpy (trptr, &short_x, 2);
   trptr += 2;