diff --git a/ChangeLog b/ChangeLog
index db8ef780a6..d34cbac343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-25  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/iso-2022-kr.c (BODY): Fake initialization of array buf
+	to keep gcc quiet.
+	* iconvdata/iso-2022-cn.c (BODY): Likewise.
+
 	* locale/programs/ld-collate.c (collate_output): Avoid warning if
 	NDEBUG is defined.
 
diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c
index 4825d72f0d..1613cf2329 100644
--- a/iconvdata/iso-2022-cn.c
+++ b/iconvdata/iso-2022-cn.c
@@ -264,6 +264,9 @@ enum
     else								      \
       {									      \
 	unsigned char buf[2];						      \
+	/* Fake initialization to keep gcc quiet.  */			      \
+	asm ("" : "=m" (buf));						      \
+									      \
 	int used;							      \
 	size_t written = 0;						      \
 									      \
diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c
index 1a16d213a7..6439b0a469 100644
--- a/iconvdata/iso-2022-kr.c
+++ b/iconvdata/iso-2022-kr.c
@@ -200,9 +200,7 @@ enum
 #define LOOPFCT			TO_LOOP
 #define BODY \
   {									      \
-    uint32_t ch;							      \
-									      \
-    ch = get32 (inptr);							      \
+    uint32_t ch = get32 (inptr);					      \
 									      \
     /* First see whether we can write the character using the currently	      \
        selected character set.  */					      \
@@ -224,10 +222,10 @@ enum
     else								      \
       {									      \
 	unsigned char buf[2];						      \
-	size_t written;							      \
-									      \
-	written = ucs4_to_ksc5601 (ch, buf, 2);				      \
+	/* Fake initialization to keep gcc quiet.  */			      \
+	asm ("" : "=m" (buf));						      \
 									      \
+	size_t written = ucs4_to_ksc5601 (ch, buf, 2);			      \
 	if (__builtin_expect (written, 0) == __UNKNOWN_10646_CHAR)	      \
 	  {								      \
 	    UNICODE_TAG_HANDLER (ch, 4);				      \