diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 80edef8b01e..430e75f54ae 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2018-05-30 Arnaud Charlet + + * gcc-interface/Makefile.in: Move target pair settings from here... + * Makefile.rtl: ... to here. + (setup-rts): New target. + 2018-05-29 Eric Botcazou * doc/gnat_ugn/building_executable_programs_with_gnat.rst (Alphabetical diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl index ed43ae5273c..17d2ecc1f05 100644 --- a/gcc/ada/Makefile.rtl +++ b/gcc/ada/Makefile.rtl @@ -713,3 +713,1963 @@ GNATRTL_NONTASKING_OBJS= \ $(GNATRTL_ALTIVEC_OBJS) \ $(GNATRTL_SOCKETS_OBJS) \ $(EXTRA_GNATRTL_NONTASKING_OBJS) + +# LIBGNAT_TARGET_PAIRS is a list of pairs of filenames. +# The members of each pair must be separated by a '<' and no whitespace. +# Each pair must be separated by some amount of whitespace from the following +# pair. + +# Non-tasking case: + +LIBGNAT_TARGET_PAIRS = \ +a-intnam.ads +# finds them at runtime. +GCC_SPEC_FILES= + +# $(filter-out PATTERN...,TEXT) removes all PATTERN words from TEXT. +# $(strip STRING) removes leading and trailing spaces from STRING. +# If what's left is null then it's a match. + +# PowerPC and e500v2 VxWorks +ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,$(target_cpu) $(target_vendor) $(target_os))),) + + ifeq ($(strip $(filter-out e500%, $(target_alias))),) + ARCH_STR=e500 + # gcc config translates the target e500v2-wrs-vxworks to + # powerpc-wrs-vxworksspe. Let's keep the original alias here when + # generating s-oscons.ads. + target=$(target_alias) + else + ifeq ($(strip $(filter-out powerpc64, $(target_cpu))),) + ARCH_STR=ppc64 + else + ARCH_STR=ppc + endif + endif + + VX=$(strip $(if $(filter vxworks7%, $(target_os)), vxworks7, vxworks)) + SVX=system-$(VX) + GCC_SPEC_FILES+=$(VX)-gnat-crtbe-link.spec + + LIBGNAT_TARGET_PAIRS = \ + a-intnam.ads -# finds them at runtime. -GCC_SPEC_FILES= - -# $(filter-out PATTERN...,TEXT) removes all PATTERN words from TEXT. -# $(strip STRING) removes leading and trailing spaces from STRING. -# If what's left is null then it's a match. - -# PowerPC and e500v2 VxWorks -ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,$(target_cpu) $(target_vendor) $(target_os))),) - - ifeq ($(strip $(filter-out e500%, $(target_alias))),) - ARCH_STR=e500 - # gcc config translates the target e500v2-wrs-vxworks to - # powerpc-wrs-vxworksspe. Let's keep the original alias here when - # generating s-oscons.ads. - target=$(target_alias) - else - ifeq ($(strip $(filter-out powerpc64, $(target_cpu))),) - ARCH_STR=ppc64 - else - ARCH_STR=ppc - endif - endif - - ifeq ($(strip $(filter-out vxworks7%, $(target_os))),) - SVX=system-vxworks7 - else - SVX=system-vxworks - endif - - LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads