diff --git a/gold/ChangeLog b/gold/ChangeLog
index c6278584082..6752c13bea5 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-05  Jing Yu  <jingyu@google.com>
+
+	* gold.h (textdomain): Add do {} to empty while(0).
+	(bindtextdomain): Likewise.
+
 2012-06-04  Cary Coutant  <ccoutant@google.com>
 
 	* dynobj.cc (Sized_dynobj::do_get_global_symbol_counts): Call
diff --git a/gold/gold.h b/gold/gold.h
index 88fc4de603b..4258d5543d7 100644
--- a/gold/gold.h
+++ b/gold/gold.h
@@ -58,8 +58,8 @@
 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) while (0) /* nothing */
-# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
+# define textdomain(Domainname) do {} while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) do {} while (0) /* nothing */
 # define _(String) (String)
 # define N_(String) (String)
 #endif