diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2836e2619fd0f6d9edc643925f5f4f10c12a3a8a..b69987f8bc6d5b8bffe459dd5389c3788cced7f5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-25  Kai Tietz  <ktietz@redhat.com>
+
+	* adaint.c (__gnat_to_canonical_file_list_next): Use array
+	initialization instead of const/none-const pointer assignment.
+
 2011-05-24  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc-interface/Make-lang.in (GNAT1_OBJS): Don't include
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 855ce34895a1a046cf8610e3f01bd099a3033db5..bea33f60f2cac8457783a032f2555d969b3ac376 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -3367,7 +3367,7 @@ __gnat_to_canonical_file_list_init
 char *
 __gnat_to_canonical_file_list_next (void)
 {
-  static char *empty = "";
+  static char empty[] = "";
   return empty;
 }