diff options
| author | Jose Ruiz <ruiz@adacore.com> | 2008-07-30 15:03:32 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-07-30 15:03:32 +0200 |
| commit | f921a1cd93f089a81c2ae2cee22bc9b0ee3beee5 (patch) | |
| tree | c8d430dcadbd4486ea1435759e643eff045f98f3 /gcc/ada/gcc-interface | |
| parent | 88462e8132982857e69c9e7f0d8481f8443e8bbc (diff) | |
| download | gcc-f921a1cd93f089a81c2ae2cee22bc9b0ee3beee5.zip gcc-f921a1cd93f089a81c2ae2cee22bc9b0ee3beee5.tar.gz gcc-f921a1cd93f089a81c2ae2cee22bc9b0ee3beee5.tar.bz2 | |
2008-07-30 Jose Ruiz <ruiz@adacore.com>
* adaint.c
(__gnat_file_exists): Do not use __gnat_stat for RTX.
(__main for RTX in RTSS mode): Create this dummy procedure symbol to
avoid the use of this symbol from libgcc.a in RTX kernel mode.
* cio.c
(put_int, put_int_stderr, put_char, put_char_stderr): For RTX we call
the function RtPrintf for console output.
* argv.c Do not use the environ variable for RTX.
* gnatlink.adb (gnatlink): The part that handles the --RTS option has
been moved before the call to Osint.Add_Default_Search_Dirs in order
to take into account the flags in system.ads (RTX_RTSS_Kernel_Module)
from the appropriate run time.
* targparm.ads
(RTX_RTSS_Kernel_Module_On_Target): Add this flag that is set to True if
target is a RTSS module for RTX.
* targparm.adb (Targparm_Tags, RTX_Str, Targparm_Str): Add tag RTX for
RTX_RTSS_Kernel_Module
(Get_Target_Parameters): Add processing of RTX_RTSS_Kernel_Module flag.
* gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS for RTX): Use gcc
exception handling mechanism for Windows and RTX in Win32 mode, but
not for RTX in kernel mode (RTSS).
(LIBGNAT_SRCS): Remove ada.h
From-SVN: r138305
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 020ee20..a8c0c1b 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1326,13 +1326,20 @@ ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) s-intman.adb<s-intman-dummy.adb \ s-osinte.ads<s-osinte-rtx.ads \ s-osprim.adb<s-osprim-rtx.adb \ - s-taprop.adb<s-taprop-rtx.adb \ - system.ads<system-rtx.ads + s-taprop.adb<s-taprop-rtx.adb EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o - MISCLIB = -lwsock32 -lrtapi_w32 - THREADSLIB=-lrtapi_w32 + ifeq ($(strip $(filter-out rtx_w32,$(THREAD_KIND))),) + LIBGNAT_TARGET_PAIRS += system.ads<system-rtx.ads + + EH_MECHANISM=-gcc + else + LIBGNAT_TARGET_PAIRS += system.ads<system-rtx-rtss.ads + + EH_MECHANISM= + endif + else LIBGNAT_TARGET_PAIRS += \ a-exetim.adb<a-exetim-mingw.adb \ @@ -1354,13 +1361,14 @@ ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) # ??? This will be replaced by gnatlib-shared-dual-win32 when GNAT # auto-import support for array/record will be done. GNATLIB_SHARED = gnatlib-shared-win32 + + EH_MECHANISM=-gcc endif TOOLS_TARGET_PAIRS= \ mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \ indepsw.adb<indepsw-mingw.adb - EH_MECHANISM=-gcc GMEM_LIB = gmemlib PREFIX_OBJS = $(PREFIX_REAL_OBJS) EXTRA_GNATTOOLS = ../../gnatdll$(exeext) @@ -1706,7 +1714,7 @@ endif # while GNATRTL_OBJS lists the object files compiled from Ada sources that # go into the directory. The pthreads emulation is built in the threads # subdirectory and copied. -LIBGNAT_SRCS = ada.h adaint.c adaint.h argv.c cio.c cstreams.c \ +LIBGNAT_SRCS = adaint.c adaint.h argv.c cio.c cstreams.c \ errno.c exit.c cal.c ctrl_c.c env.c env.h \ raise.h raise.c sysdep.c aux-io.c init.c initialize.c seh_init.c \ final.c tracebak.c tb-alvms.c tb-alvxw.c tb-gcc.c expect.c mkdir.c \ |