a-calend-vms.adb (Leap_Sec_Ops): Temp body for package in private part of Ada.Calendar...

2006-10-31  Hristian Kirtchev  <kirtchev@adacore.com>
	    Jose Ruiz  <ruiz@adacore.com>

	* a-calend-vms.adb (Leap_Sec_Ops): Temp body for package in private
	part of Ada.Calendar: all subprogram raise Unimplemented.
	(Split_W_Offset): Temp function body, raising Unimplemented

	* a-calend.ads, a-calend-vms.ads: 
	Add imported variable Invalid_TZ_Offset used to designate targets unable
	to support time zones.
	(Unimplemented): Temporary function raised by the body of new
	subprograms below.
	(Leap_Sec_Ops): New package in the private part of Ada.Calendar. This
	unit provides handling of leap seconds and is used by the new Ada 2005
	packages Ada.Calendar.Arithmetic and Ada.Calendar.Formatting.
	(Split_W_Offset): Identical spec to that of Ada.Calendar.Split. This
	version returns an extra value which is the offset to UTC.

	* a-calend.adb (Split_W_Offset): Add call to localtime_tzoff.
	(Leap_Sec_Ops): New body for package in private part of Ada.Calendar.
	(Split_W_Offset): New function body.
	(Time_Of): When a date is close to UNIX epoch, compute the time for
	that date plus one day (that amount is later substracted after
	executing mktime) so there are no problems with time zone adjustments.

	* a-calend-mingw.adb: Remove Windows specific version no longer needed.

	* a-calari.ads, a-calari.adb, a-calfor.ads, a-calfor.adb,
	a-catizo.ads, a-catizo.adb: New files.

        * impunit.adb: Add new Ada 2005 entries

	* sysdep.c: Add external variable __gnat_invalid_tz_offset.
	Rename all occurences of "__gnat_localtime_r" to
	"__gnat_localtime_tzoff".
	(__gnat_localtime_tzoff for Windows): Add logic to retrieve the time
	zone data and calculate the GMT offset.
	(__gnat_localtime_tzoff for Darwin, Free BSD, Linux, Lynx and Tru64):
	Use the field "tm_gmtoff" to extract the GMT offset.
	(__gnat_localtime_tzoff for AIX, HPUX, SGI Irix and Sun Solaris): Use
	the external variable "timezone" to calculate the GMT offset.

From-SVN: r118234

gcc/ada/a-calari.adb

+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--              A D A . C A L E N D A R . A R I T H M E T I C               --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--            Copyright (C) 2006, 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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- As a special exception,  if other files  instantiate  generics from this --
+-- unit, or you link  this unit with other files  to produce an executable, --
+-- this  unit  does not  by itself cause  the resulting  executable  to  be --
+-- covered  by the  GNU  General  Public  License.  This exception does not --
+-- however invalidate  any other reasons why  the executable file  might be --
+-- covered by the  GNU Public License.                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+with Unchecked_Conversion;
+
+package body Ada.Calendar.Arithmetic is
+
+   use Leap_Sec_Ops;
+
+   Day_Duration : constant Duration := 86_400.0;
+
+   ---------
+   -- "+" --
+   ---------
+
+   function "+" (Left : Time; Right : Day_Count) return Time is
+   begin
+      return Left + Integer (Right) * Day_Duration;
+   end "+";
+
+   function "+" (Left : Day_Count; Right : Time) return Time is
+   begin
+      return Integer (Left) * Day_Duration + Right;
+   end "+";
+
+   ---------
+   -- "-" --
+   ---------
+
+   function "-" (Left : Time; Right : Day_Count) return Time is
+   begin
+      return Left - Integer (Right) * Day_Duration;
+   end "-";
+
+   function "-" (Left, Right : Time) return Day_Count is
+      Days         : Day_Count;
+      Seconds      : Duration;
+      Leap_Seconds : Leap_Seconds_Count;
+
+   begin
+      Difference (Left, Right, Days, Seconds, Leap_Seconds);
+      return Days;
+   end "-";
+
+   ----------------
+   -- Difference --
+   ----------------
+
+   procedure Difference
+     (Left, Right  : Time;
+      Days         : out Day_Count;
+      Seconds      : out Duration;
+      Leap_Seconds : out Leap_Seconds_Count)
+   is
+      Diff        : Duration;
+      Earlier     : Time;
+      Later       : Time;
+      Leaps_Dur   : Duration;
+      Negate      : Boolean;
+      Next_Leap   : Time;
+      Secs_Diff   : Long_Integer;
+      Sub_Seconds : Duration;
+
+   begin
+      if Left >= Right then
+         Later   := Left;
+         Earlier := Right;
+         Negate  := False;
+      else
+         Later   := Right;
+         Earlier := Left;
+         Negate  := True;
+      end if;
+
+      Diff := Later - Earlier;
+
+      Cumulative_Leap_Secs (Earlier, Later, Leaps_Dur, Next_Leap);
+
+      if Later >= Next_Leap then
+         Leaps_Dur := Leaps_Dur + 1.0;
+      end if;
+
+      Diff := Diff - Leaps_Dur;
+
+      declare
+         type D_Int is range 0 .. 2 ** (Duration'Size - 1) - 1;
+         for D_Int'Size use Duration'Size;
+
+         Small_Div : constant D_Int := D_Int (1.0 / Duration'Small);
+         D_As_Int  : D_Int;
+
+         function To_D_As_Int is new Unchecked_Conversion (Duration, D_Int);
+         function To_Duration is new Unchecked_Conversion (D_Int, Duration);
+
+      begin
+         D_As_Int    := To_D_As_Int (Diff);
+         Secs_Diff   := Long_Integer (D_As_Int / Small_Div);
+         Sub_Seconds := To_Duration (D_As_Int rem Small_Div);
+      end;
+
+      Days    := Day_Count (Secs_Diff / 86_400);
+      Seconds := Duration (Secs_Diff mod 86_400) + Sub_Seconds;
+      Leap_Seconds := Leap_Seconds_Count (Leaps_Dur);
+
+      if Negate then
+         Days         := -Days;
+         Seconds      := -Seconds;
+         Leap_Seconds := -Leap_Seconds;
+      end if;
+   end Difference;
+
+end Ada.Calendar.Arithmetic;

gcc/ada/a-calari.ads

+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--              A D A . C A L E N D A R . A R I T H M E T I C               --
+--                                                                          --
+--                                 S p e c                                  --
+--                                                                          --
+--        Copyright (C) 2005 - 2006, Free Software Foundation, Inc.         --
+--                                                                          --
+-- This specification is derived from the Ada Reference Manual for use with --
+-- GNAT. The copyright notice above, and the license provisions that follow --
+-- apply solely to the  contents of the part following the private keyword. --
+--                                                                          --
+-- 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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- As a special exception,  if other files  instantiate  generics from this --
+-- unit, or you link  this unit with other files  to produce an executable, --
+-- this  unit  does not  by itself cause  the resulting  executable  to  be --
+-- covered  by the  GNU  General  Public  License.  This exception does not --
+-- however invalidate  any other reasons why  the executable file  might be --
+-- covered by the  GNU Public License.                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+package Ada.Calendar.Arithmetic is
+
+   --  Arithmetic on days:
+
+   type Day_Count is range
+     -(366 * (1 + Year_Number'Last - Year_Number'First))
+        ..
+     +(366 * (1 + Year_Number'Last - Year_Number'First));
+
+   subtype Leap_Seconds_Count is Integer range -2047 .. 2047;
+
+   procedure Difference
+     (Left, Right  : Time;
+      Days         : out Day_Count;
+      Seconds      : out Duration;
+      Leap_Seconds : out Leap_Seconds_Count);
+
+   function "+" (Left : Time; Right : Day_Count) return Time;
+   function "+" (Left : Day_Count; Right : Time) return Time;
+   function "-" (Left : Time; Right : Day_Count) return Time;
+   function "-" (Left, Right : Time) return Day_Count;
+
+end Ada.Calendar.Arithmetic;

gcc/ada/a-calend-vms.adb

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2005, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2006, 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- --
@@ -224,7 +224,7 @@ package body Ada.Calendar is
       procedure Numtim (
         Status : out Unsigned_Longword;
         Timbuf : out Unsigned_Word_Array;
-        Timadr : in  Time);
+        Timadr : Time);
 
       pragma Interface (External, Numtim);
 
@@ -256,6 +256,22 @@ package body Ada.Calendar is
       Year  := Integer (Timbuf (1));
    end Split;
 
+   -----------------------
+   -- Split_With_Offset --
+   -----------------------
+
+   procedure Split_With_Offset
+     (Date    : Time;
+      Year    : out Year_Number;
+      Month   : out Month_Number;
+      Day     : out Day_Number;
+      Seconds : out Day_Duration;
+      Offset  : out Long_Integer)
+   is
+   begin
+      raise Unimplemented;
+   end Split_With_Offset;
+
    -------------
    -- Time_Of --
    -------------
@@ -270,7 +286,7 @@ package body Ada.Calendar is
 
       procedure Cvt_Vectim (
         Status         : out Unsigned_Longword;
-        Input_Time     : in  Unsigned_Word_Array;
+        Input_Time     : Unsigned_Word_Array;
         Resultant_Time : out Time);
 
       pragma Interface (External, Cvt_Vectim);
@@ -358,4 +374,43 @@ package body Ada.Calendar is
       return DY;
    end Year;
 
+   -------------------
+   --  Leap_Sec_Ops --
+   -------------------
+
+   --  The package that is used by the Ada 2005 children of Ada.Calendar:
+   --  Ada.Calendar.Arithmetic and Ada.Calendar.Formatting.
+
+   package body Leap_Sec_Ops is
+
+      --------------------------
+      -- Cumulative_Leap_Secs --
+      --------------------------
+
+      procedure Cumulative_Leap_Secs
+        (Start_Date    : Time;
+         End_Date      : Time;
+         Leaps_Between : out Duration;
+         Next_Leap_Sec : out Time)
+      is
+      begin
+         raise Unimplemented;
+      end Cumulative_Leap_Secs;
+
+      ----------------------
+      -- All_Leap_Seconds --
+      ----------------------
+
+      function All_Leap_Seconds return Duration is
+      begin
+         raise Unimplemented;
+         return 0.0;
+      end All_Leap_Seconds;
+
+   --  Start of processing in package Leap_Sec_Ops
+
+   begin
+      null;
+   end Leap_Sec_Ops;
+
 end Ada.Calendar;

gcc/ada/a-calend-vms.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2005, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -87,6 +87,8 @@ package Ada.Calendar is
 
    Time_Error : exception;
 
+   Unimplemented : exception;
+
 private
 
    pragma Inline (Clock);
@@ -118,4 +120,66 @@ private
    --  Relative Time is positive, whereas relative OS_Time is negative,
    --  but this declaration makes for easier conversion.
 
+   --  The following package provides handling of leap seconds. It is
+   --  used by Ada.Calendar.Arithmetic and Ada.Calendar.Formatting, both
+   --  Ada 2005 children of Ada.Calendar.
+
+   package Leap_Sec_Ops is
+
+      After_Last_Leap : constant Time := Time'Last;
+      --  Bigger by far than any leap second value. Not within range of
+      --  Ada.Calendar specified dates.
+
+      procedure Cumulative_Leap_Secs
+        (Start_Date    : Time;
+         End_Date      : Time;
+         Leaps_Between : out Duration;
+         Next_Leap_Sec : out Time);
+      --  Leaps_Between is the sum of the leap seconds that have occured
+      --  on or after Start_Date and before (strictly before) End_Date.
+      --  Next_Leap_Sec represents the next leap second occurence on or
+      --  after End_Date. If there are no leaps seconds after End_Date,
+      --  After_Last_Leap is returned. This does not provide info about
+      --  the next leap second (pos/neg or ?). After_Last_Leap can be used
+      --  as End_Date to count all the leap seconds that have occured on
+      --  or after Start_Date.
+      --
+      --  Important Notes: any fractional parts of Start_Date and End_Date
+      --  are discarded before the calculations are done. For instance: if
+      --  113 seconds is a leap second (it isn't) and 113.5 is input as an
+      --  End_Date, the leap second at 113 will not be counted in
+      --  Leaps_Between, but it will be returned as Next_Leap_Sec. Thus, if
+      --  the caller wants to know if the End_Date is a leap second, the
+      --  comparison should be:
+      --
+      --     End_Date >= Next_Leap_Sec;
+      --
+      --  After_Last_Leap is designed so that this comparison works without
+      --  having to first check if Next_Leap_Sec is a valid leap second.
+
+      function All_Leap_Seconds return Duration;
+      --  Returns the sum off all of the leap seoncds.
+
+   end Leap_Sec_Ops;
+
+   procedure Split_With_Offset
+     (Date    : Time;
+      Year    : out Year_Number;
+      Month   : out Month_Number;
+      Day     : out Day_Number;
+      Seconds : out Day_Duration;
+      Offset  : out Long_Integer);
+   --  Split_W_Offset has the same spec as Split with the addition of an
+   --  offset value which give the offset of the local time zone from UTC
+   --  at the input Date. This value comes for free during the implementation
+   --  of Split and is needed by UTC_Time_Offset. The returned Offset time
+   --  is straight from the C tm struct and is in seconds. If the system
+   --  dependent code has no way to find the offset it will return the value
+   --  Invalid_TZ_Offset declared below. Otherwise no checking is done, so
+   --  it is up to the user to check both for Invalid_TZ_Offset and otherwise
+   --  for a value that is acceptable.
+
+   Invalid_TZ_Offset : Long_Integer;
+   pragma Import (C, Invalid_TZ_Offset, "__gnat_invalid_tzoff");
+
 end Ada.Calendar;

gcc/ada/a-calend.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2005, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -127,4 +127,66 @@ private
 
    type Time is new Duration;
 
+   --  The following package provides handling of leap seconds. It is
+   --  used by Ada.Calendar.Arithmetic and Ada.Calendar.Formatting, both
+   --  Ada 2005 children of Ada.Calendar.
+
+   package Leap_Sec_Ops is
+
+      After_Last_Leap : constant Time := Time'Last;
+      --  Bigger by far than any leap second value. Not within range of
+      --  Ada.Calendar specified dates.
+
+      procedure Cumulative_Leap_Secs
+        (Start_Date    : Time;
+         End_Date      : Time;
+         Leaps_Between : out Duration;
+         Next_Leap_Sec : out Time);
+      --  Leaps_Between is the sum of the leap seconds that have occured
+      --  on or after Start_Date and before (strictly before) End_Date.
+      --  Next_Leap_Sec represents the next leap second occurence on or
+      --  after End_Date. If there are no leaps seconds after End_Date,
+      --  After_Last_Leap is returned. This does not provide info about
+      --  the next leap second (pos/neg or ?). After_Last_Leap can be used
+      --  as End_Date to count all the leap seconds that have occured on
+      --  or after Start_Date.
+      --
+      --  Important Notes: any fractional parts of Start_Date and End_Date
+      --  are discarded before the calculations are done. For instance: if
+      --  113 seconds is a leap second (it isn't) and 113.5 is input as an
+      --  End_Date, the leap second at 113 will not be counted in
+      --  Leaps_Between, but it will be returned as Next_Leap_Sec. Thus, if
+      --  the caller wants to know if the End_Date is a leap second, the
+      --  comparison should be:
+      --
+      --     End_Date >= Next_Leap_Sec;
+      --
+      --  After_Last_Leap is designed so that this comparison works without
+      --  having to first check if Next_Leap_Sec is a valid leap second.
+
+      function All_Leap_Seconds return Duration;
+      --  Returns the sum off all of the leap seoncds.
+
+   end Leap_Sec_Ops;
+
+   procedure Split_With_Offset
+     (Date    : Time;
+      Year    : out Year_Number;
+      Month   : out Month_Number;
+      Day     : out Day_Number;
+      Seconds : out Day_Duration;
+      Offset  : out Long_Integer);
+   --  Split_W_Offset has the same spec as Split with the addition of an
+   --  offset value which give the offset of the local time zone from UTC
+   --  at the input Date. This value comes for free during the implementation
+   --  of Split and is needed by UTC_Time_Offset. The returned Offset time
+   --  is straight from the C tm struct and is in seconds. If the system
+   --  dependent code has no way to find the offset it will return the value
+   --  Invalid_TZ_Offset declared below. Otherwise no checking is done, so
+   --  it is up to the user to check both for Invalid_TZ_Offset and otherwise
+   --  for a value that is acceptable.
+
+   Invalid_TZ_Offset : Long_Integer;
+   pragma Import (C, Invalid_TZ_Offset, "__gnat_invalid_tzoff");
+
 end Ada.Calendar;

gcc/ada/a-calfor.ads

+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--              A D A . C A L E N D A R . F O R M A T T I N G               --
+--                                                                          --
+--                                 S p e c                                  --
+--                                                                          --
+--        Copyright (C) 2005 - 2006, Free Software Foundation, Inc.         --
+--                                                                          --
+-- This specification is derived from the Ada Reference Manual for use with --
+-- GNAT. The copyright notice above, and the license provisions that follow --
+-- apply solely to the  contents of the part following the private keyword. --
+--                                                                          --
+-- 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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- As a special exception,  if other files  instantiate  generics from this --
+-- unit, or you link  this unit with other files  to produce an executable, --
+-- this  unit  does not  by itself cause  the resulting  executable  to  be --
+-- covered  by the  GNU  General  Public  License.  This exception does not --
+-- however invalidate  any other reasons why  the executable file  might be --
+-- covered by the  GNU Public License.                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+with Ada.Calendar.Time_Zones;
+
+package Ada.Calendar.Formatting is
+
+   --  Day of the week
+
+   type Day_Name is
+     (Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday);
+
+   function Day_Of_Week (Date : Time) return Day_Name;
+
+   --  Hours:Minutes:Seconds access
+
+   subtype Hour_Number     is Natural range 0 .. 23;
+   subtype Minute_Number   is Natural range 0 .. 59;
+   subtype Second_Number   is Natural range 0 .. 59;
+   subtype Second_Duration is Day_Duration range 0.0 .. 1.0;
+
+   function Year
+     (Date      : Time;
+      Time_Zone : Time_Zones.Time_Offset := 0) return Year_Number;
+
+   function Month
+     (Date      : Time;
+      Time_Zone : Time_Zones.Time_Offset := 0) return Month_Number;
+
+   function Day
+     (Date      : Time;
+      Time_Zone : Time_Zones.Time_Offset := 0) return Day_Number;
+
+   function Hour
+     (Date      : Time;
+      Time_Zone : Time_Zones.Time_Offset := 0) return Hour_Number;
+
+   function Minute
+     (Date      : Time;
+      Time_Zone : Time_Zones.Time_Offset := 0) return Minute_Number;
+
+   function Second
+     (Date : Time)                             return Second_Number;
+
+   function Sub_Second
+     (Date : Time)                             return Second_Duration;
+
+   function Seconds_Of
+     (Hour       : Hour_Number;
+      Minute     : Minute_Number;
+      Second     : Second_Number := 0;
+      Sub_Second : Second_Duration := 0.0) return Day_Duration;
+
+   procedure Split
+     (Seconds    : Day_Duration;
+      Hour       : out Hour_Number;
+      Minute     : out Minute_Number;
+      Second     : out Second_Number;
+      Sub_Second : out Second_Duration);
+
+   procedure Split
+     (Date       : Time;
+      Year       : out Year_Number;
+      Month      : out Month_Number;
+      Day        : out Day_Number;
+      Hour       : out Hour_Number;
+      Minute     : out Minute_Number;
+      Second     : out Second_Number;
+      Sub_Second : out Second_Duration;
+      Time_Zone  : Time_Zones.Time_Offset := 0);
+
+   function Time_Of
+     (Year        : Year_Number;
+      Month       : Month_Number;
+      Day         : Day_Number;
+      Hour        : Hour_Number;
+      Minute      : Minute_Number;
+      Second      : Second_Number;
+      Sub_Second  : Second_Duration := 0.0;
+      Leap_Second : Boolean := False;
+      Time_Zone   : Time_Zones.Time_Offset := 0) return Time;
+
+   function Time_Of
+     (Year        : Year_Number;
+      Month       : Month_Number;
+      Day         : Day_Number;
+      Seconds     : Day_Duration := 0.0;
+      Leap_Second : Boolean := False;
+      Time_Zone   : Time_Zones.Time_Offset := 0) return Time;
+
+   procedure Split
+     (Date        : Time;
+      Year        : out Year_Number;
+      Month       : out Month_Number;
+      Day         : out Day_Number;
+      Hour        : out Hour_Number;
+      Minute      : out Minute_Number;
+      Second      : out Second_Number;
+      Sub_Second  : out Second_Duration;
+      Leap_Second : out Boolean;
+      Time_Zone   : Time_Zones.Time_Offset := 0);
+
+   procedure Split
+     (Date        : Time;
+      Year        : out Year_Number;
+      Month       : out Month_Number;
+      Day         : out Day_Number;
+      Seconds     : out Day_Duration;
+      Leap_Second : out Boolean;
+      Time_Zone   : Time_Zones.Time_Offset := 0);
+
+   --  Simple image and value
+
+   function Image
+     (Date                  : Time;
+      Include_Time_Fraction : Boolean := False;
+      Time_Zone             : Time_Zones.Time_Offset := 0) return String;
+
+   function Value
+     (Date       : String;
+      Time_Zone  : Time_Zones.Time_Offset := 0) return Time;
+
+   function Image
+     (Elapsed_Time          : Duration;
+      Include_Time_Fraction : Boolean := False) return String;
+
+   function Value (Elapsed_Time : String) return Duration;
+
+end Ada.Calendar.Formatting;

gcc/ada/a-catizo.adb

+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--              A D A . C A L E N D A R . T I M E _ Z O N E S               --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--            Copyright (C) 2006, 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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- As a special exception,  if other files  instantiate  generics from this --
+-- unit, or you link  this unit with other files  to produce an executable, --
+-- this  unit  does not  by itself cause  the resulting  executable  to  be --
+-- covered  by the  GNU  General  Public  License.  This exception does not --
+-- however invalidate  any other reasons why  the executable file  might be --
+-- covered by the  GNU Public License.                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+package body Ada.Calendar.Time_Zones is
+
+   ---------------------
+   -- UTC_Time_Offset --
+   ---------------------
+
+   function UTC_Time_Offset (Date : Time := Clock) return Time_Offset is
+      Year    : Year_Number;
+      Month   : Month_Number;
+      Day     : Day_Number;
+      Seconds : Day_Duration;
+      Offset  : Long_Integer;
+
+   begin
+      Split_With_Offset (Date, Year, Month, Day, Seconds, Offset);
+
+      --  The system dependent code does not support time zones
+
+      if Offset = Invalid_TZ_Offset then
+         raise Unknown_Zone_Error;
+      end if;
+
+      Offset := Offset / 60;
+
+      if Offset < Long_Integer (Time_Offset'First)
+        or else Offset > Long_Integer (Time_Offset'Last)
+      then
+         raise Unknown_Zone_Error;
+      end if;
+
+      return Time_Offset (Offset);
+   end UTC_Time_Offset;
+
+end Ada.Calendar.Time_Zones;

gcc/ada/a-catizo.ads

+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--              A D A . C A L E N D A R . T I M E _ Z O N E S               --
+--                                                                          --
+--                                 S p e c                                  --
+--                                                                          --
+--        Copyright (C) 2005 - 2006, Free Software Foundation, Inc.         --
+--                                                                          --
+-- This specification is derived from the Ada Reference Manual for use with --
+-- GNAT. The copyright notice above, and the license provisions that follow --
+-- apply solely to the  contents of the part following the private keyword. --
+--                                                                          --
+-- 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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- As a special exception,  if other files  instantiate  generics from this --
+-- unit, or you link  this unit with other files  to produce an executable, --
+-- this  unit  does not  by itself cause  the resulting  executable  to  be --
+-- covered  by the  GNU  General  Public  License.  This exception does not --
+-- however invalidate  any other reasons why  the executable file  might be --
+-- covered by the  GNU Public License.                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+package Ada.Calendar.Time_Zones is
+
+   --  Time zone manipulation
+
+   type Time_Offset is range -(28 * 60) .. 28 * 60;
+
+   Unknown_Zone_Error : exception;
+
+   function UTC_Time_Offset (Date : Time := Clock) return Time_Offset;
+
+end Ada.Calendar.Time_Zones;

gcc/ada/impunit.adb

@@ -334,8 +334,10 @@ package body Impunit is
    -- Ada Hierarchy Units from Ada 2005 Reference Manual --
    --------------------------------------------------------
 
+     "a-calari",    -- Ada.Calendar.Arithmetic
+     "a-calfor",    -- Ada.Calendar.Formatting
+     "a-catizo",    -- Ada.Calendar.Time_Zones
      "a-cdlili",    -- Ada.Containers.Doubly_Linked_Lists
-     "a-cgaaso",    -- Ada.Containers.Generic_Anonymous_Array_Sort
      "a-cgarso",    -- Ada.Containers.Generic_Array_Sort
      "a-cgcaso",    -- Ada.Containers.Generic_Constrained_Array_Sort
      "a-chacon",    -- Ada.Characters.Conversions
@@ -353,11 +355,10 @@ package body Impunit is
      "a-coorse",    -- Ada.Containers.Ordered_Sets
      "a-coteio",    -- Ada.Complex_Text_IO
      "a-direct",    -- Ada.Directories
+     "a-diroro",    -- Ada.Dispatching.Round_Robin
+     "a-dispat",    -- Ada.Dispatching
      "a-envvar",    -- Ada.Environment_Variables
      "a-rttiev",    -- Ada.Real_Time.Timing_Events
-     "a-secain",    -- Ada.Strings.Equal_Case_Insensitive
-     "a-shcain",    -- Ada.Strings.Hash_Case_Insensitive
-     "a-slcain",    -- Ada.Strings.Less_Case_Insensitive
      "a-stboha",    -- Ada.Strings.Bounded.Hash
      "a-stfiha",    -- Ada.Strings.Fixed.Hash
      "a-strhas",    -- Ada.Strings.Hash
@@ -383,6 +384,8 @@ package body Impunit is
      "a-wwboio",    -- Ada.Wide_Text_IO.Wide_Bounded_IO
      "a-wwunio",    -- Ada.Wide_Text_IO.Wide_Unbounded_IO
      "a-zchara",    -- Ada.Wide_Wide_Characters
+     "a-ztcoio",    -- Ada.Wide_Wide_Text_IO.Complex_IO
+     "a-ztedit",    -- Ada.Wide_Wide_Text_IO.Editing
      "a-zttest",    -- Ada.Wide_Wide_Text_IO.Text_Streams
      "a-ztexio",    -- Ada.Wide_Wide_Text_IO
      "a-zzboio",    -- Ada.Wide_Wide_Text_IO.Wide_Wide_Bounded_IO
@@ -408,10 +411,15 @@ package body Impunit is
    -- GNAT Defined Additions to Ada 2005 --
    ----------------------------------------
 
+     "a-cgaaso",    -- Ada.Containers.Generic_Anonymous_Array_Sort
      "a-chzla1",    -- Ada.Characters.Wide_Wide_Latin_1
      "a-chzla9",    -- Ada.Characters.Wide_Wide_Latin_9
      "a-ciormu",    -- Ada.Containers.Indefinite_Ordered_Multisets
      "a-coormu",    -- Ada.Containers.Ordered_Multisets
+     "a-crdlli",    -- Ada.Containers.Restricted_Doubly_Linked_Lists
+     "a-secain",    -- Ada.Strings.Equal_Case_Insensitive
+     "a-shcain",    -- Ada.Strings.Hash_Case_Insensitive
+     "a-slcain",    -- Ada.Strings.Less_Case_Insensitive
      "a-szuzti",    -- Ada.Strings.Wide_Wide_Unbounded.Wide_Wide_Text_IO
      "a-zchuni",    -- Ada.Wide_Wide_Characters.Unicode
 

gcc/ada/sysdep.c

@@ -44,7 +44,6 @@
 #include "tsystem.h"
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <time.h>
 #ifdef VMS
 #include <unixio.h>
 #endif
@@ -53,6 +52,14 @@
 #include "system.h"
 #endif
 
+#include <time.h>
+
+#if defined (sun) && defined (__SVR4) && !defined (__vxworks)
+/* The declaration is present in <time.h> but conditionalized
+   on a couple of macros we don't define.  */
+extern struct tm *localtime_r(const time_t *, struct tm *);
+#endif
+
 #include "adaint.h"
 
 /*
@@ -664,8 +671,6 @@ rts_get_nShowCmd (void)
 
 /* This gets around a problem with using the old threads library on VMS 7.0. */
 
-#include <time.h>
-
 extern long get_gmtoff (void);
 
 long
@@ -680,27 +685,57 @@ get_gmtoff (void)
 }
 #endif
 
+/* This value is returned as the time zone offset when a valid value
+   cannot be determined. It is simply a bizarre value that will never
+   occur. It is 3 days plus 73 seconds (offset is in seconds. */
+
+long __gnat_invalid_tzoff = 259273;
+
 /* Definition of __gnat_locatime_r used by a-calend.adb */
 
-#if defined (__EMX__)
+#if defined (__EMX__) || defined (__MINGW32__)
+
+#ifdef CERT
+
+/* For the Cert run times on native Windows we use dummy functions
+   for locking and unlocking tasks since we do not support multiple
+   threads on this configuration (Cert run time on native Windows). */
+
+void dummy (void) {}
+
+void (*Lock_Task) ()   = &dummy;
+void (*Unlock_Task) () = &dummy;
+
+#else
+
 #define Lock_Task system__soft_links__lock_task
 extern void (*Lock_Task) (void);
 
 #define Unlock_Task system__soft_links__unlock_task
 extern void (*Unlock_Task) (void);
 
-/* Provide reentrant version of localtime on OS/2. */
+#endif
+
+/* Reentrant localtime for Windows and OS/2. */
 
-extern struct tm *__gnat_localtime_r (const time_t *, struct tm *);
+extern struct tm *
+__gnat_localtime_tzoff (const time_t *, struct tm *, long *);
 
 struct tm *
-__gnat_localtime_r (const time_t *timer, struct tm *tp)
+__gnat_localtime_tzoff (const time_t *timer, struct tm *tp, long *off)
 {
+  DWORD dwRet;
   struct tm *tmp;
+  TIME_ZONE_INFORMATION tzi;
 
   (*Lock_Task) ();
   tmp = localtime (timer);
   memcpy (tp, tmp, sizeof (struct tm));
+  dwRet = GetTimeZoneInformation (&tzi);
+  *off = tzi.Bias;
+  if (tp->tm_isdst > 0)
+    *off = *off + tzi.DaylightBias;
+  *off = *off * -60;
   (*Unlock_Task) ();
   return tp;
 }
@@ -714,31 +749,51 @@ __gnat_localtime_r (const time_t *timer, struct tm *tp)
    spec is required. Only use when ___THREADS_POSIX4ad4__ is defined,
    the Lynx convention when building against the legacy API. */
 
-extern struct tm *__gnat_localtime_r (const time_t *, struct tm *);
+extern struct tm *
+__gnat_localtime_tzoff (const time_t *, struct tm *, long *);
 
 struct tm *
-__gnat_localtime_r (const time_t *timer, struct tm *tp)
+__gnat_localtime_tzoff (const time_t *timer, struct tm *tp, long *off)
 {
   localtime_r (tp, timer);
+  *off = __gnat_invalid_tzoff;
   return NULL;
 }
 
 #else
-#if defined (VMS) || defined (__MINGW32__)
+#if defined (VMS)
 
-/* __gnat_localtime_r is not needed on NT and VMS */
+/* __gnat_localtime_tzoff is not needed on VMS */
 
 #else
 
 /* All other targets provide a standard localtime_r */
 
-extern struct tm *__gnat_localtime_r (const time_t *, struct tm *);
+extern struct tm *
+__gnat_localtime_tzoff (const time_t *, struct tm *, long *);
 
 struct tm *
-__gnat_localtime_r (const time_t *timer, struct tm *tp)
+__gnat_localtime_tzoff (const time_t *timer, struct tm *tp, long *off)
 {
-  return (struct tm *) localtime_r (timer, tp);
+   localtime_r (timer, tp);
+
+/* AIX, HPUX, SGI Irix, Sun Solaris */
+#if defined (_AIX) || defined (__hpux__) || defined (sgi) || defined (sun)
+  *off = (long) -timezone;
+  if (tp->tm_isdst > 0)
+    *off = *off + 3600;
+
+/* Lynx, VXWorks */
+#elif defined (__Lynx__) || defined (__vxworks)
+  *off = __gnat_invalid_tzoff;
+
+/* Darwin, Free BSD, Linux, Tru64 */
+#else
+  *off = tp->tm_gmtoff;
+#endif
+   return NULL;
 }
+
 #endif
 #endif
 #endif