From 895225568c89bc48d317b258c6fc2dbd56697dd0 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@adacore.com>
Date: Wed, 6 May 2009 10:07:42 +0000
Subject: [PATCH] Makefile.in: Update LIBGNAT_TARGET_PAIRS for Xenomai.

	* gcc-interface/Makefile.in: Update LIBGNAT_TARGET_PAIRS for Xenomai.
	Fix missing unit for rtp-smp runtime on both ppc and x86 vxworks

	* gcc-interface/Make-lang.in: Update dependencies

From-SVN: r147165
---
 gcc/ada/ChangeLog                  |  7 +++++++
 gcc/ada/gcc-interface/Make-lang.in | 28 ++++++++++++----------------
 gcc/ada/gcc-interface/Makefile.in  |  8 +++++++-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 46eb7c1d1b5..cf22d53dfb4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-06  Arnaud Charlet  <charlet@adacore.com>
+
+	* gcc-interface/Makefile.in: Update LIBGNAT_TARGET_PAIRS for Xenomai.
+	Fix missing unit for rtp-smp runtime on both ppc and x86 vxworks
+
+	* gcc-interface/Make-lang.in: Update dependencies
+
 2009-05-06  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch12.adb (Build_Instance_Compilation_Unit_Nodes): Revert previous
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index a5b29b97f54..cac0bf810b0 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -1415,22 +1415,18 @@ ada/checks.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \
 ada/comperr.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \
    ada/a-uncdea.ads ada/alloc.ads ada/atree.ads ada/atree.adb \
    ada/casing.ads ada/comperr.ads ada/comperr.adb ada/debug.ads \
-   ada/einfo.ads ada/einfo.adb ada/err_vars.ads ada/errout.ads \
-   ada/erroutc.ads ada/fname.ads ada/gnat.ads ada/g-hesorg.ads \
-   ada/g-htable.ads ada/gnatvsn.ads ada/hostparm.ads ada/lib.ads \
-   ada/lib.adb ada/lib-list.adb ada/lib-sort.adb ada/namet.ads \
-   ada/nlists.ads ada/nlists.adb ada/opt.ads ada/osint.ads ada/output.ads \
-   ada/output.adb ada/rident.ads ada/sdefault.ads ada/sinfo.ads \
-   ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/snames.ads \
-   ada/sprint.ads ada/stand.ads ada/stringt.ads ada/system.ads \
-   ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \
-   ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \
-   ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \
-   ada/s-stoele.adb ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads \
-   ada/s-wchcon.ads ada/table.ads ada/table.adb ada/targparm.ads \
-   ada/tree_io.ads ada/treepr.ads ada/types.ads ada/uintp.ads \
-   ada/uintp.adb ada/uname.ads ada/unchconv.ads ada/unchdeal.ads \
-   ada/urealp.ads ada/widechar.ads 
+   ada/einfo.ads ada/err_vars.ads ada/errout.ads ada/erroutc.ads \
+   ada/gnatvsn.ads ada/hostparm.ads ada/namet.ads ada/nlists.ads \
+   ada/nlists.adb ada/opt.ads ada/osint.ads ada/output.ads ada/output.adb \
+   ada/rident.ads ada/sdefault.ads ada/sinfo.ads ada/sinfo.adb \
+   ada/sinput.ads ada/snames.ads ada/sprint.ads ada/system.ads \
+   ada/s-exctab.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \
+   ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \
+   ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads ada/s-stoele.adb \
+   ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads ada/s-wchcon.ads \
+   ada/table.ads ada/table.adb ada/targparm.ads ada/tree_io.ads \
+   ada/treepr.ads ada/types.ads ada/uintp.ads ada/unchconv.ads \
+   ada/unchdeal.ads ada/urealp.ads 
 
 ada/csets.o : ada/ada.ads ada/a-unccon.ads ada/a-uncdea.ads ada/csets.ads \
    ada/csets.adb ada/debug.ads ada/hostparm.ads ada/opt.ads ada/system.ads \
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index c19c0995941..c7c515993e7 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -497,6 +497,8 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
       s-vxwext.ads<s-vxwext-kernel.ads \
       s-vxwext.adb<s-vxwext-kernel.adb \
       system.ads<system-vxworks-ppc-kernel.ads
+
+      EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o
     else
       LIBGNAT_TARGET_PAIRS += \
       system.ads<system-vxworks-ppc.ads
@@ -727,6 +729,8 @@ ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),)
       s-vxwext.ads<s-vxwext-kernel.ads \
       s-vxwext.adb<s-vxwext-kernel.adb \
       system.ads<system-vxworks-x86-kernel.ads
+
+      EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o
     else
       LIBGNAT_TARGET_PAIRS += \
       system.ads<system-vxworks-x86.ads
@@ -937,7 +941,6 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
   g-bytswa.adb<g-bytswa-x86.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
   g-sercom.adb<g-sercom-linux.adb
 
@@ -953,6 +956,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
     s-osinte.ads<s-osinte-linux-marte.ads \
     s-osprim.adb<s-osprim-posix.adb \
     s-taprop.adb<s-taprop-linux-marte.adb \
+    s-taspri.ads<s-taspri-posix.ads \
     system.ads<system-linux-x86.ads
 
     EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o a-extiti.o
@@ -969,6 +973,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
       s-osinte.ads<s-osinte-linux-xenomai.ads \
       s-osprim.adb<s-osprim-linux-xenomai.adb \
       s-taprop.adb<s-taprop-linux-xenomai.adb \
+      s-taspri.ads<s-taspri-linux-xenomai.ads \
       system.ads<system-linux-x86-xenomai.ads
 
       EH_MECHANISM=-gcc
@@ -977,6 +982,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
       s-osinte.ads<s-osinte-linux.ads \
       s-osprim.adb<s-osprim-posix.adb \
       s-taprop.adb<s-taprop-linux.adb \
+      s-taspri.ads<s-taspri-posix.ads \
       s-tasinf.ads<s-tasinf-linux.ads \
       s-tasinf.adb<s-tasinf-linux.adb \
       system.ads<system-linux-x86.ads
-- 
2.30.2