diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 237d756d432..97ba0a6a568 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-10  Thomas Quinot  <quinot@adacore.com>
+
+	* exp_attr.adb: Minor reformatting
+
+2009-04-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_prag.adb (Check_Precondition_Postcondition): Within a generic,
+	analyze the expression for a postcondition, even if the compiler mode
+	is Generate_Code.
+
 2009-04-10  Robert Dewar  <dewar@adacore.com>
 
 	* sem_aux.adb: Minor reformatting
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 6c3d1d4be6e..d1d6ee9862c 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -1346,7 +1346,6 @@ package body Exp_Attr is
       begin
          --  We have an object of a task interface class-wide type as a prefix
          --  to Callable. Generate:
-
          --    callable (Task_Id (Pref._disp_get_task_id));
 
          if Ada_Version >= Ada_05
@@ -4361,7 +4360,7 @@ package body Exp_Attr is
                Analyze_And_Resolve (N, RTE (RE_Tag));
             end if;
 
-         --  (Ada 2005 (AI-251): The use of 'Tag in the sources always
+         --  Ada 2005 (AI-251): The use of 'Tag in the sources always
          --  references the primary tag of the actual object. If 'Tag is
          --  applied to class-wide interface objects we generate code that
          --  displaces "this" to reference the base of the object.
@@ -4408,7 +4407,6 @@ package body Exp_Attr is
       begin
          --  The prefix of Terminated is of a task interface class-wide type.
          --  Generate:
-
          --    terminated (Task_Id (Pref._disp_get_task_id));
 
          if Ada_Version >= Ada_05
diff --git a/gcc/ada/sem_aux.adb b/gcc/ada/sem_aux.adb
index 9f7342a690c..f2f55ce2ba0 100755
--- a/gcc/ada/sem_aux.adb
+++ b/gcc/ada/sem_aux.adb
@@ -119,7 +119,7 @@ package body Sem_Aux is
       elsif Nkind (D) = N_Object_Renaming_Declaration then
          return Renamed_Object (Ent);
 
-      --  If this is a component declaration whose entity is constant, it is
+      --  If this is a component declaration whose entity is a constant, it is
       --  a prival within a protected function (and so has no constant value).
 
       elsif Nkind (D) = N_Component_Declaration then
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 6f4e07fe87a..af7cf60ce8b 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -1456,7 +1456,9 @@ package body Sem_Prag is
          if Nkind (Parent (N)) = N_Subprogram_Body
            and then List_Containing (N) = Declarations (Parent (N))
          then
-            if Operating_Mode /= Generate_Code then
+            if Operating_Mode /= Generate_Code
+              or else Inside_A_Generic
+            then
 
                --  Analyze expression in pragma, for correctness
                --  and for ASIS use.