diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index dcf38fdcd77..bbbe1359083 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-05  Robert Dewar <dewar@gnat.com>
+
+	* sem_warn.adb: Remove stuff for conditionals, we are not going to 
+	do this after all.
+	
+	* sem_warn.ads: Remove stuff for conditionals, we are not going to 
+	do this after all.  Add 2001 to copyright notice
+
 2001-12-04  Geert Bosch <bosch@gnat.com>
 
 	*  einfo.h, sinfo.h, treeprs.ads: Regenerate.
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index b31aff7f437..7ec5201c039 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -882,24 +882,6 @@ package body Sem_Warn is
       end if;
    end Check_Unused_Withs;
 
-   ---------------------
-   -- End_Conditional --
-   ---------------------
-
-   procedure End_Conditional is
-   begin
-      null;
-   end End_Conditional;
-
-   --------------
-   -- End_Unit --
-   --------------
-
-   procedure End_Unit is
-   begin
-      null;
-   end End_Unit;
-
    ----------------------------------
    -- Output_Unreferenced_Messages --
    ----------------------------------
@@ -972,33 +954,6 @@ package body Sem_Warn is
       end loop;
    end Output_Unreferenced_Messages;
 
-   ------------------
-   -- Start_Branch --
-   ------------------
-
-   procedure Start_Branch (Loc : Source_Ptr) is
-   begin
-      null;
-   end Start_Branch;
-
-   -----------------------
-   -- Start_Conditional --
-   -----------------------
-
-   procedure Start_Conditional (If_Stmt : Boolean) is
-   begin
-      null;
-   end Start_Conditional;
-
-   ----------------
-   -- Start_Unit --
-   ----------------
-
-   procedure Start_Unit is
-   begin
-      null;
-   end Start_Unit;
-
    -----------------------------
    -- Warn_On_Known_Condition --
    -----------------------------
diff --git a/gcc/ada/sem_warn.ads b/gcc/ada/sem_warn.ads
index 0c5d75956a0..1482ff8a878 100644
--- a/gcc/ada/sem_warn.ads
+++ b/gcc/ada/sem_warn.ads
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---                            $Revision: 1.3 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1999-2000 Free Software Foundation, Inc.          --
+--          Copyright (C) 1999-2001 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -87,39 +87,6 @@ package Sem_Warn is
    --  using the flags set by the initial call where appropriate to specialize
    --  the text of the warning messages.
 
-   ----------------------------------------
-   -- Routines to Deal with Conditionals --
-   ----------------------------------------
-
-   --  These routines provide the necessary interfacing information to
-   --  correctly handle references in conditional structures (if/then/end-if,
-   --  or case/when/end-case). The issue here is that if a variable is only
-   --  set in some but not all branches of a conditional, then it is not
-   --  considered as being set by the conditional as a whole.
-
-   procedure Start_Unit;
-   --  Mark start of new unit to be analyzed, deals with fact that a call to
-   --  Rtsfind may cause new unit to be analyzed in middle of conditional.
-
-   procedure End_Unit;
-   --  Mark end of unit corresponding to previous call to Start_Unit
-
-   procedure Start_Conditional (If_Stmt : Boolean);
-   --  Mark start of a new conditional structure (an if-elsif-else-endif
-   --  or a case-when-end-case structure). If_Stmt is True for the IF
-   --  statement case, and False for the CASE statement case.
-
-   procedure Start_Branch (Loc : Source_Ptr);
-   --  Start processing of one branch of conditional previously marked by
-   --  a call to Start_Conditional (i.e. start of then/elsif/else statements
-   --  or set of statements after a when condition). The Loc value is the
-   --  source pointer to be used in warning messages concerning variables
-   --  not properly initialized in this branch. A branch is terminated by
-   --  either another Start_Branch or End_Conditional call.
-
-   procedure End_Conditional;
-   --  Terminate conditional started by previous Start_Conditional statement.
-
    ---------------------
    -- Output Routines --
    ---------------------