2008-08-05 Jose Ruiz <ruiz@adacore.com>

	* init.c (__gnat_install_handler for linux): If we are building the
	Xenomai run time then we need to do two additional things: avoid
	memory swapping and transform the Linux environment task into a native
	Xenomai task.

	* gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS for xenomai run
	time): Use interface to Xenomai native skin and avoid linux-specific
	way of setting CPU affinity.
	(EH_MECHANISM for the xenomai run time): Use sjlj exception mechanism.

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

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index ff8ebbe..058094c 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -850,13 +850,24 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
     LIBGNAT_TARGET_PAIRS += \
     g-soccon.ads<g-soccon-linux-x86.ads \
     s-linux.ads<s-linux.ads \
-    s-osinte.adb<s-osinte-posix.adb \
-    s-osinte.ads<s-osinte-linux.ads \
-    s-tasinf.ads<s-tasinf-linux.ads \
-    s-tasinf.adb<s-tasinf-linux.adb \
-    s-taprop.adb<s-taprop-linux.adb
+    s-osinte.adb<s-osinte-posix.adb
+
+    ifeq ($(strip $(filter-out xenomai,$(THREAD_KIND))),)
+      LIBGNAT_TARGET_PAIRS += \
+      s-osinte.ads<s-osinte-linux-xenomai.ads \
+      s-taprop.adb<s-taprop-linux-xenomai.adb
+
+      EH_MECHANISM=
+    else
+      LIBGNAT_TARGET_PAIRS += \
+      s-osinte.ads<s-osinte-linux.ads \
+      s-taprop.adb<s-taprop-linux.adb \
+      s-tasinf.ads<s-tasinf-linux.ads \
+      s-tasinf.adb<s-tasinf-linux.adb
+
+      EH_MECHANISM=-gcc
+    endif
 
-    EH_MECHANISM=-gcc
     THREADSLIB = -lpthread
     EXTRA_GNATRTL_TASKING_OBJS=s-linux.o
   endif

diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 47fc71e..d2c22ea 100644 (file)
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -746,11 +746,35 @@ __gnat_error_handler (int sig,
 char __gnat_alternate_stack[16 * 1024]; /* 2 * SIGSTKSZ */
 #endif
 
+#ifdef __XENO__
+#include <sys/mman.h>
+#include <native/task.h>
+
+RT_TASK main_task;
+#endif
+
 void
 __gnat_install_handler (void)
 {
   struct sigaction act;
 
+#ifdef __XENO__
+  int prio;
+
+  if (__gl_main_priority == -1)
+    prio = 49;
+  else
+    prio = __gl_main_priority;
+
+  /* Avoid memory swapping for this program */
+
+  mlockall (MCL_CURRENT|MCL_FUTURE);
+
+  /* Turn the current Linux task into a native Xenomai task */
+
+  rt_task_shadow(&main_task, "environment_task", prio, T_FPU);
+#endif
+
   /* Set up signal handler to map synchronous signals to appropriate
      exceptions.  Make sure that the handler isn't interrupted by another
      signal that might cause a scheduling event!  Also setup an alternate