* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,

	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 119 insertions, 303 deletions

diff --git a/gcc/ada/5zosinte.ads b/gcc/ada/5zosinte.ads
index 5eddd7296fa..e4cc5585211 100644
--- a/gcc/ada/5zosinte.ads
+++ b/gcc/ada/5zosinte.ads
@@ -29,8 +29,7 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNARL was developed by the GNARL team at Florida State University. It is --
--- now maintained by Ada Core Technologies Inc. in cooperation with Florida --
--- State University (http://www.gnat.com).                                  --
+-- now maintained by Ada Core Technologies, Inc. (http://www.gnat.com).     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -50,19 +49,15 @@
 
 with Interfaces.C;
 with System.VxWorks;
+
 package System.OS_Interface is
    pragma Preelaborate;
 
-   subtype int            is Interfaces.C.int;
-   subtype short          is Interfaces.C.short;
-   subtype long           is Interfaces.C.long;
-   subtype unsigned       is Interfaces.C.unsigned;
-   subtype unsigned_short is Interfaces.C.unsigned_short;
-   subtype unsigned_long  is Interfaces.C.unsigned_long;
-   subtype unsigned_char  is Interfaces.C.unsigned_char;
-   subtype plain_char     is Interfaces.C.plain_char;
-   subtype size_t         is Interfaces.C.size_t;
-   subtype char           is Interfaces.C.char;
+   subtype int         is Interfaces.C.int;
+   subtype short       is Short_Integer;
+   type long           is new Long_Integer;
+   type unsigned_long  is mod 2 ** long'Size;
+   type size_t         is mod 2 ** Standard'Address_Size;
 
    -----------
    -- Errno --
@@ -83,14 +78,6 @@ package System.OS_Interface is
    -- Signals and Interrupts --
    ----------------------------
 
-   --  In order to support both signal and hardware interrupt handling,
-   --  the ranges of "interrupt IDs" for the vectored hardware interrupts
-   --  and the signals are catenated. In other words, the external IDs
-   --  used to designate signals are relocated beyond the range of the
-   --  vectored interrupts. The IDs given in Ada.Interrupts.Names should
-   --  be used to designate signals; vectored interrupts are designated
-   --  by their interrupt number.
-
    NSIG : constant := 32;
    --  Number of signals on the target OS
    type Signal is new int range 0 .. Interfaces.C."-" (NSIG, 1);
@@ -98,7 +85,7 @@ package System.OS_Interface is
    Max_HW_Interrupt : constant := System.VxWorks.Num_HW_Interrupts - 1;
    type HW_Interrupt is new int range 0 .. Max_HW_Interrupt;
 
-   Max_Interrupt : constant := Max_HW_Interrupt + NSIG;
+   Max_Interrupt : constant := Max_HW_Interrupt;
 
    SIGILL  : constant :=  4; --  illegal instruction (not reset)
    SIGABRT : constant :=  6; --  used by abort, replace SIGIOT in the future
@@ -116,10 +103,9 @@ package System.OS_Interface is
    SIG_SETMASK : constant := 3;
 
    --  The sa_flags in struct sigaction.
-   SA_SIGINFO : constant := 16#0002#;
-   SA_ONSTACK : constant := 16#0004#;
+   SA_SIGINFO   : constant := 16#0002#;
+   SA_ONSTACK   : constant := 16#0004#;
 
-   --  ANSI args and returns from signal().
    SIG_DFL : constant := 0;
    SIG_IGN : constant := 1;
 
@@ -170,6 +156,17 @@ package System.OS_Interface is
       oset : sigset_t_ptr) return int;
    pragma Import (C, pthread_sigmask, "sigprocmask");
 
+   type t_id is new long;
+   subtype Thread_Id is t_id;
+
+   function kill (pid : t_id; sig : Signal) return int;
+   pragma Import (C, kill, "kill");
+
+   --  VxWorks doesn't have getpid; taskIdSelf is the equivalent
+   --  routine.
+   function getpid return t_id;
+   pragma Import (C, getpid, "taskIdSelf");
+
    ----------
    -- Time --
    ----------
@@ -199,261 +196,104 @@ package System.OS_Interface is
      (clock_id : clockid_t; tp : access timespec) return int;
    pragma Import (C, clock_gettime, "clock_gettime");
 
-   -------------------------
-   -- Priority Scheduling --
-   -------------------------
-
-   --  Scheduling policies.
-   SCHED_FIFO  : constant := 1;
-   SCHED_RR    : constant := 2;
-   SCHED_OTHER : constant := 4;
+   type ULONG is new unsigned_long;
 
-   -------------
-   -- Threads --
-   -------------
+   procedure tickSet (ticks : ULONG);
+   pragma Import (C, tickSet, "tickSet");
 
-   type Thread_Body is access
-     function (arg : System.Address) return System.Address;
+   function tickGet return ULONG;
+   pragma Import (C, tickGet, "tickGet");
 
-   type pthread_t           is private;
-   subtype Thread_Id        is pthread_t;
+   -----------------------------------------------------
+   --  Convenience routine to convert between VxWorks --
+   --  priority and Ada priority.                     --
+   -----------------------------------------------------
 
-   null_pthread : constant pthread_t;
+   function To_VxWorks_Priority (Priority : in int) return int;
+   pragma Inline (To_VxWorks_Priority);
 
-   type pthread_mutex_t     is limited private;
-   type pthread_cond_t      is limited private;
-   type pthread_attr_t      is limited private;
-   type pthread_mutexattr_t is limited private;
-   type pthread_condattr_t  is limited private;
-   type pthread_key_t       is private;
-
-   PTHREAD_CREATE_DETACHED : constant := 0;
-   PTHREAD_CREATE_JOINABLE : constant := 1;
-
-   function kill (pid : pthread_t; sig : Signal) return int;
-   pragma Import (C, kill, "kill");
-
-   --  VxWorks doesn't have getpid; taskIdSelf is the equivalent
-   --  routine.
-   function getpid return pthread_t;
-   pragma Import (C, getpid, "taskIdSelf");
-
-   ---------------------------------
-   -- Nonstandard Thread Routines --
-   ---------------------------------
-
-   procedure pthread_init;
-   pragma Inline (pthread_init);
-   --  Vxworks requires this for the moment.
+   --------------------------
+   -- VxWorks specific API --
+   --------------------------
 
-   function taskIdSelf return pthread_t;
+   function taskIdSelf return t_id;
    pragma Import (C, taskIdSelf, "taskIdSelf");
 
-   function taskSuspend (tid : pthread_t) return int;
+   function taskSuspend (tid : t_id) return int;
    pragma Import (C, taskSuspend, "taskSuspend");
 
-   function taskResume (tid : pthread_t) return int;
+   function taskResume (tid : t_id) return int;
    pragma Import (C, taskResume, "taskResume");
 
-   function taskIsSuspended (tid : pthread_t) return int;
+   function taskIsSuspended (tid : t_id) return int;
    pragma Import (C, taskIsSuspended, "taskIsSuspended");
 
    function taskVarAdd
-     (tid  : pthread_t;
-      pVar : access System.Address) return int;
+     (tid : t_id; pVar : System.Address) return int;
    pragma Import (C, taskVarAdd, "taskVarAdd");
 
    function taskVarDelete
-     (tid  : pthread_t;
-      pVar : access System.Address) return int;
+     (tid : t_id; pVar : access System.Address) return int;
    pragma Import (C, taskVarDelete, "taskVarDelete");
 
    function taskVarSet
-     (tid   : pthread_t;
+     (tid   : t_id;
       pVar  : access System.Address;
       value : System.Address) return int;
    pragma Import (C, taskVarSet, "taskVarSet");
 
    function taskVarGet
-     (tid   : pthread_t;
-      pVar  : access System.Address) return int;
+     (tid  : t_id;
+      pVar : access System.Address) return int;
    pragma Import (C, taskVarGet, "taskVarGet");
 
-   function taskInfoGet
-     (tid       : pthread_t;
-      pTaskDesc : access System.VxWorks.TASK_DESC) return int;
-   pragma Import (C, taskInfoGet, "taskInfoGet");
-
    function taskDelay (ticks : int) return int;
+   procedure taskDelay (ticks : int);
    pragma Import (C, taskDelay, "taskDelay");
 
    function sysClkRateGet return int;
    pragma Import (C, sysClkRateGet, "sysClkRateGet");
 
-   --------------------------
-   -- POSIX.1c  Section 11 --
-   --------------------------
-
-   function pthread_mutexattr_init
-     (attr : access pthread_mutexattr_t) return int;
-   pragma Inline (pthread_mutexattr_init);
-
-   function pthread_mutexattr_destroy
-     (attr : access pthread_mutexattr_t) return int;
-   pragma Inline (pthread_mutexattr_destroy);
-
-   function pthread_mutex_init
-     (mutex : access pthread_mutex_t;
-      attr  : access pthread_mutexattr_t) return int;
-   pragma Inline (pthread_mutex_init);
-
-   function pthread_mutex_destroy (mutex : access pthread_mutex_t) return int;
-   pragma Inline (pthread_mutex_destroy);
-
-   function pthread_mutex_lock (mutex : access pthread_mutex_t) return int;
-   pragma Inline (pthread_mutex_lock);
-
-   function pthread_mutex_unlock (mutex : access pthread_mutex_t) return int;
-   pragma Inline (pthread_mutex_unlock);
-
-   function pthread_condattr_init
-     (attr : access pthread_condattr_t) return int;
-   pragma Inline (pthread_condattr_init);
-
-   function pthread_condattr_destroy
-     (attr : access pthread_condattr_t) return int;
-   pragma Inline (pthread_condattr_destroy);
-
-   function pthread_cond_init
-     (cond : access pthread_cond_t;
-      attr : access pthread_condattr_t) return int;
-   pragma Inline (pthread_cond_init);
-
-   function pthread_cond_destroy (cond : access pthread_cond_t) return int;
-   pragma Inline (pthread_cond_destroy);
-
-   function pthread_cond_signal (cond : access pthread_cond_t) return int;
-   pragma Inline (pthread_cond_signal);
-
-   function pthread_cond_wait
-     (cond  : access pthread_cond_t;
-      mutex : access pthread_mutex_t) return int;
-   pragma Inline (pthread_cond_wait);
-
-   function pthread_cond_timedwait
-     (cond    : access pthread_cond_t;
-      mutex   : access pthread_mutex_t;
-      abstime : access timespec) return int;
-   pragma Inline (pthread_cond_timedwait);
-
-   --------------------------
-   -- POSIX.1c  Section 13 --
-   --------------------------
-
-   PTHREAD_PRIO_NONE    : constant := 0;
-   PTHREAD_PRIO_PROTECT : constant := 2;
-   PTHREAD_PRIO_INHERIT : constant := 1;
-
-   function pthread_mutexattr_setprotocol
-     (attr     : access pthread_mutexattr_t;
-      protocol : int) return int;
-   pragma Inline (pthread_mutexattr_setprotocol);
-
-   function pthread_mutexattr_setprioceiling
-     (attr        : access pthread_mutexattr_t;
-      prioceiling : int) return int;
-   pragma Inline (pthread_mutexattr_setprioceiling);
-
-   type struct_sched_param is record
-      sched_priority : int;
-   end record;
-
-   function pthread_setschedparam
-     (thread : pthread_t;
-      policy : int;
-      param  : access struct_sched_param) return int;
-   pragma Inline (pthread_setschedparam);
-
-   function sched_yield return int;
-   pragma Inline (sched_yield);
-
-   function pthread_sched_rr_set_interval (usecs : int) return int;
-   pragma Inline (pthread_sched_rr_set_interval);
-
-   ---------------------------
-   -- P1003.1c - Section 16 --
-   ---------------------------
-
-   function pthread_attr_init (attr : access pthread_attr_t) return int;
-   pragma Inline (pthread_attr_init);
-
-   function pthread_attr_destroy (attr : access pthread_attr_t) return int;
-   pragma Inline (pthread_attr_destroy);
-
-   function pthread_attr_setdetachstate
-     (attr        : access pthread_attr_t;
-      detachstate : int) return int;
-   pragma Inline (pthread_attr_setdetachstate);
-
-   function pthread_attr_setstacksize
-     (attr      : access pthread_attr_t;
-      stacksize : size_t) return int;
-   pragma Inline (pthread_attr_setstacksize);
-
-   function pthread_attr_setname_np
-     (attr : access pthread_attr_t;
-      name : System.Address) return int;
-   --  In VxWorks tasks, we have a non-portable routine to set the
-   --  task name. This makes it really convenient for debugging.
-   pragma Inline (pthread_attr_setname_np);
-
-   function pthread_create
-     (thread        : access pthread_t;
-      attr          : access pthread_attr_t;
-      start_routine : Thread_Body;
-      arg           : System.Address) return int;
-   pragma Inline (pthread_create);
-
-   function pthread_detach (thread : pthread_t) return int;
-   pragma Inline (pthread_detach);
-
-   procedure pthread_exit (status : System.Address);
-   pragma Inline (pthread_exit);
-
-   function pthread_self return pthread_t;
-   pragma Inline (pthread_self);
-
-   function pthread_equal (t1 : pthread_t; t2 : pthread_t) return int;
-   pragma Inline (pthread_equal);
-   --  be careful not to use "=" on thread_t!
-
-   --------------------------
-   -- POSIX.1c  Section 17 --
-   --------------------------
-
-   function pthread_setspecific
-     (key   : pthread_key_t;
-      value : System.Address) return int;
-   pragma Inline (pthread_setspecific);
-
-   function pthread_getspecific (key : pthread_key_t) return System.Address;
-   pragma Inline (pthread_getspecific);
-
-   type destructor_pointer is access procedure (arg : System.Address);
-
-   function pthread_key_create
-     (key        : access pthread_key_t;
-      destructor : destructor_pointer) return int;
-   pragma Inline (pthread_key_create);
-
-   --  VxWorks binary semaphores. These are exported for use by the
-   --  implementation of hardware interrupt handling.
+   --  Option flags for taskSpawn
+
+   VX_UNBREAKABLE    : constant := 16#0002#;
+   VX_FP_TASK        : constant := 16#0008#;
+   VX_FP_PRIVATE_ENV : constant := 16#0080#;
+   VX_NO_STACK_FILL  : constant := 16#0100#;
+
+   function taskSpawn
+     (name          : System.Address;  --  Pointer to task name
+      priority      : int;
+      options       : int;
+      stacksize     : size_t;
+      start_routine : System.Address;
+      arg1          : System.Address;
+      arg2          : int := 0;
+      arg3          : int := 0;
+      arg4          : int := 0;
+      arg5          : int := 0;
+      arg6          : int := 0;
+      arg7          : int := 0;
+      arg8          : int := 0;
+      arg9          : int := 0;
+      arg10         : int := 0) return t_id;
+   pragma Import (C, taskSpawn, "taskSpawn");
+
+   procedure taskDelete (tid : t_id);
+   pragma Import (C, taskDelete, "taskDelete");
+
+   function kernelTimeSlice (ticks : int) return int;
+   pragma Import (C, kernelTimeSlice, "kernelTimeSlice");
+
+   function taskPrioritySet
+     (tid : t_id; newPriority : int) return int;
+   pragma Import (C, taskPrioritySet, "taskPrioritySet");
 
    subtype STATUS is int;
    --  Equivalent of the C type STATUS
 
    OK    : constant STATUS := 0;
-   ERROR : constant STATUS := Interfaces.C."-" (1);
+   ERROR : constant STATUS := Interfaces.C.int (-1);
 
    --  Semaphore creation flags.
 
@@ -462,7 +302,7 @@ package System.OS_Interface is
    SEM_DELETE_SAFE    : constant := 4;  -- only valid for binary semaphore
    SEM_INVERSION_SAFE : constant := 8;  -- only valid for binary semaphore
 
-   --  Semaphore initial state flags;
+   --  Semaphore initial state flags
 
    SEM_EMPTY : constant := 0;
    SEM_FULL  : constant := 1;
@@ -472,36 +312,57 @@ package System.OS_Interface is
    WAIT_FOREVER : constant := -1;
    NO_WAIT      : constant := 0;
 
-   type SEM_ID is new long;
-   --  The VxWorks semaphore ID is an integer which is really just
-   --  a pointer to a semaphore structure.
-
-   function semBCreate (Options : int; Initial_State : int) return SEM_ID;
-   --  Create a binary semaphore.  Returns ID, or 0 if memory could not
-   --  be allocated
+   --  Error codes (errno).  The lower level 16 bits are the
+   --  error code, with the upper 16 bits representing the
+   --  module number in which the error occurred.  By convention,
+   --  the module number is 0 for UNIX errors.  VxWorks reserves
+   --  module numbers 1-500, with the remaining module numbers
+   --  being available for user applications.
+
+   M_objLib                 : constant := 61 * 2**16;
+   --  semTake() failure with ticks = NO_WAIT
+   S_objLib_OBJ_UNAVAILABLE : constant := M_objLib + 2;
+   --  semTake() timeout with ticks > NO_WAIT
+   S_objLib_OBJ_TIMEOUT     : constant := M_objLib + 4;
+
+   type SEM_ID is new System.Address;
+   --  typedef struct semaphore *SEM_ID;
+
+   --  We use two different kinds of VxWorks semaphores: mutex
+   --  and binary semaphores.  A null ID is returned when
+   --  a semaphore cannot be created.
+
+   function semBCreate (options : int; initial_state : int) return SEM_ID;
+   --  Create a binary semaphore. Return ID, or 0 if memory could not
+   --  be allocated.
    pragma Import (C, semBCreate, "semBCreate");
 
-   function semTake (SemID : SEM_ID; Timeout : int) return STATUS;
+   function semMCreate (options : int) return SEM_ID;
+   pragma Import (C, semMCreate, "semMCreate");
+
+   function semDelete (Sem : SEM_ID) return int;
+   --  Delete a semaphore
+   pragma Import (C, semDelete, "semDelete");
+
+   function semGive (Sem : SEM_ID) return int;
+   pragma Import (C, semGive, "semGive");
+
+   function semTake (Sem : SEM_ID; timeout : int) return int;
    --  Attempt to take binary semaphore.  Error is returned if operation
    --  times out
    pragma Import (C, semTake, "semTake");
 
-   function semGive (SemID : SEM_ID) return STATUS;
-   --  Release one thread blocked on the semaphore
-   pragma Import (C, semGive, "semGive");
-
    function semFlush (SemID : SEM_ID) return STATUS;
    --  Release all threads blocked on the semaphore
    pragma Import (C, semFlush, "semFlush");
 
-   function semDelete (SemID : SEM_ID) return STATUS;
-   --  Delete a semaphore
-   pragma Import (C, semDelete, "semDelete");
+   function taskLock return int;
+   pragma Import (C, taskLock, "taskLock");
 
+   function taskUnlock return int;
+   pragma Import (C, taskUnlock, "taskUnlock");
 
 private
-   --  This interface assumes that "unsigned" and "int" are 32-bit entities.
-
    type sigset_t is new long;
 
    type pid_t is new int;
@@ -511,49 +372,4 @@ private
    type clockid_t is new int;
    CLOCK_REALTIME : constant clockid_t := 0;
 
-   --  Priority ceilings are now implemented in the body of
-   --  this package.
-
-   type pthread_mutexattr_t is record
-      Flags        : int;   --  mutex semaphore creation flags
-      Prio_Ceiling : int;   --  priority ceiling
-      Protocol     : int;
-   end record;
-
-   type pthread_mutex_t is record
-      Mutex        : SEM_ID;
-      Protocol     : int;
-      Prio_Ceiling : int;  --  priority ceiling of lock
-   end record;
-
-   type pthread_condattr_t is record
-      Flags : int;
-   end record;
-
-   type pthread_cond_t is record
-      Sem     : SEM_ID;   --  VxWorks semaphore ID
-      Waiting : Integer;  --  Number of queued tasks waiting
-   end record;
-
-   type pthread_attr_t is record
-      Stacksize   : size_t;
-      Detachstate : int;
-      Priority    : int;
-      Taskname    : System.Address;
-   end record;
-
-   type pthread_t is new long;
-
-   null_pthread : constant pthread_t := 0;
-
-   type pthread_key_t is new int;
-
-   --  These are to store the pthread_keys that are created with
-   --  pthread_key_create.  Currently, we only need one key.
-
-   Key_Storage  : array (1 .. 10) of aliased System.Address;
-   Keys_Created : Integer;
-
-   Time_Slice : int;
-
 end System.OS_Interface;