diff options
Diffstat (limited to 'gcc/ada/gcc-interface/Makefile.in')
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 0440855..c80480e 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -274,8 +274,16 @@ INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \ ADA_INCLUDES = -I- -I. -I$(srcdir)/ada -INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada \ - -I$(fsrcdir)/../include -I$(fsrcdir) +INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \ + -I$(fsrcdir)/../include + +ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) + # On Windows native the tconfig.h files used by C runtime files needs to have + # the gcc source dir in its include dir list + INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \ + -I$(fsrcdir)/../include -I$(fsrcdir) +endif + ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada # Avoid a lot of time thinking about remaking Makefile.in and *.def. @@ -466,7 +474,7 @@ ifeq ($(strip $(filter-out m68k% wrs vx%,$(targ))),) endif endif -ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),) +ifeq ($(strip $(filter-out e500% powerpc% wrs vxworks,$(targ))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<a-intnam-vxworks.ads \ a-numaux.ads<a-numaux-vxworks.ads \ @@ -521,7 +529,8 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),) system.ads<system-vxworks-ppc-rtp.ads EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o - EXTRA_GNATRTL_TASKING_OBJS=affinity.o + EXTRA_LIBGNAT_OBJS+=affinity.o + EXTRA_LIBGNAT_SRCS+=affinity.c else ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),) LIBGNAT_TARGET_PAIRS += \ @@ -532,7 +541,8 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),) system.ads<system-vxworks-ppc-kernel.ads EH_MECHANISM=-gcc - EXTRA_GNATRTL_TASKING_OBJS=affinity.o + EXTRA_LIBGNAT_OBJS+=affinity.o + EXTRA_LIBGNAT_SRCS+=affinity.c else LIBGNAT_TARGET_PAIRS += \ s-interr.adb<s-interr-hwint.adb \ @@ -622,7 +632,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworksae,$(targ))),) endif # vxworks MILS -ifeq ($(strip $(filter-out powerpc% wrs vxworksmils,$(targ))),) +ifeq ($(strip $(filter-out e500% powerpc% wrs vxworksmils,$(targ))),) # target pairs for vthreads runtime LIBGNAT_TARGET_PAIRS = \ a-elchha.adb<a-elchha-vx6-raven-cert.adb \ @@ -837,7 +847,8 @@ ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),) system.ads<system-vxworks-x86-rtp.ads EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o - EXTRA_GNATRTL_TASKING_OBJS=affinity.o + EXTRA_LIBGNAT_SRCS+=affinity.o + EXTRA_LIBGNAT_SRCS+=affinity.c else ifeq ($(strip $(filter-out kernel-smp, $(THREAD_KIND))),) LIBGNAT_TARGET_PAIRS += \ @@ -846,7 +857,8 @@ ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),) s-vxwext.ads<s-vxwext-kernel.ads \ s-vxwext.adb<s-vxwext-kernel-smp.adb \ system.ads<system-vxworks-x86-kernel.ads - EXTRA_GNATRTL_TASKING_OBJS=affinity.o + EXTRA_LIBGNAT_OBJS+=affinity.o + EXTRA_LIBGNAT_SRCS+=affinity.c else LIBGNAT_TARGET_PAIRS += \ s-interr.adb<s-interr-hwint.adb \ @@ -1530,7 +1542,6 @@ ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(targ))) s-parame.ads<s-parame-vms-alpha.ads \ $(ATOMICS_TARGET_PAIRS) - EXTRA_GNATRTL_NONTASKING_OBJS = s-atocou.o TOOLS_TARGET_PAIRS= \ mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \ symbols.adb<symbols-vms.adb \ @@ -1548,7 +1559,7 @@ adamsg.o: adamsg.msg GNATLIB_SHARED=gnatlib-shared-vms EXTRA_LIBGNAT_SRCS+=adamsg.msg EXTRA_LIBGNAT_OBJS+=adamsg.o - EXTRA_GNATRTL_NONTASKING_OBJS+-s-po32gl.o + EXTRA_GNATRTL_NONTASKING_OBJS+=s-po32gl.o EXTRA_GNATRTL_TASKING_OBJS=s-tpopde.o EXTRA_GNATTOOLS = \ ../../gnatsym$(exeext) @@ -1617,7 +1628,6 @@ ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) s-osprim.adb<s-osprim-mingw.adb \ s-taprop.adb<s-taprop-mingw.adb - EH_MECHANISM=-gcc ifeq ($(strip $(filter-out x86_64%,$(arch))),) ifeq ($(strip $(MULTISUBDIR)),/32) LIBGNAT_TARGET_PAIRS += \ @@ -1649,6 +1659,8 @@ 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= \ @@ -2163,7 +2175,8 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) endif TOOLS_TARGET_PAIRS = \ - mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb + mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \ + indepsw.adb<indepsw-darwin.adb EH_MECHANISM=-gcc GNATLIB_SHARED = gnatlib-shared-darwin |