diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 274dde2fea3a3fc1dfa651218bd4d0adbd8a36e9..37b23e926caf177d40b8a0fa79df7e96b97e077c 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch6.adb (Expand_N_Subprogram_Declaration): Use Freeze_Before.
+	(Expand_Protected_Object_Reference): Likewise.
+	* sem_attr.adb (Resolve_Attribute): Likewise.
+	* sem_ch3.adb (Analyze_Subtype_Declaration): Likewise.
+	* sem_ch6.adb (Analyze_Subprogram_Body_Helper): Likewise.
+
 2010-10-18  Arnaud Charlet  <charlet@adacore.com>
 
 	* g-comlin.adb (Get_Switches): Prevent dereferencing null Config.
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index e2b5ea86af1965d8010960a678699c643868b0e0..82a11d321ce7685f1f353339a358a857c108b4d2 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -5459,7 +5459,7 @@ package body Exp_Ch6 is
 
             Push_Scope (Scope (Scop));
             Analyze (Prot_Decl);
-            Insert_Actions (N, Freeze_Entity (Prot_Id, N));
+            Freeze_Before (N, Prot_Id);
             Set_Protected_Body_Subprogram (Subp, Prot_Id);
 
             --  Create protected operation as well. Even though the operation
@@ -5699,7 +5699,7 @@ package body Exp_Ch6 is
                            (Corresponding_Record_Type (Scop), Loc))));
 
             Insert_Actions (N, Decls);
-            Insert_Actions (N, Freeze_Entity (Obj_Ptr, N));
+            Freeze_Before (N, Obj_Ptr);
 
             Rec :=
               Make_Explicit_Dereference (Loc,
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index 3c8a03d723d73ff3aae11d5e39d1300383288214..1691fab37f3da9798464f297c4390c69ea34a188 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -7921,7 +7921,7 @@ package body Sem_Attr is
                   --  Avoid insertion of freeze actions in spec expression mode
 
                   if not In_Spec_Expression then
-                     Insert_Actions (N, Freeze_Entity (Entity (P), N));
+                     Freeze_Before (N, Entity (P));
                   end if;
 
                elsif Is_Type (Entity (P)) then
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index f78495aa52b9d2aba4a68c589a7461231cd5acc7..d99db5204d689218d2fd2d8ed6eae89f826b971e 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -4180,7 +4180,7 @@ package body Sem_Ch3 is
          end if;
       end if;
 
-      --  Make sure that generic actual types are properly frozen The subtype
+      --  Make sure that generic actual types are properly frozen. The subtype
       --  is marked as a generic actual type when the enclosing instance is
       --  analyzed, so here we identify the subtype from the tree structure.
 
@@ -4191,7 +4191,7 @@ package body Sem_Ch3 is
         and then Nkind (Subtype_Indication (N)) /= N_Subtype_Indication
         and then Is_Frozen (T)
       then
-         Insert_Actions (N, Freeze_Entity (Id, N));
+         Freeze_Before (N, Id);
       end if;
 
       Set_Optimize_Alignment_Flags (Id);
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 761bed9a5d4a75757b42e93f5b00407ee8c5ce3b..a23aac9bb260617876d6bff5a6d0e29fe773d5d6 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -2167,7 +2167,7 @@ package body Sem_Ch6 is
             --  why, to be investigated further???
 
             Set_Has_Delayed_Freeze (Spec_Id);
-            Insert_Actions (N, Freeze_Entity (Spec_Id, N));
+            Freeze_Before (N, Spec_Id);
          end if;
       end if;