Commit ffd76236 by Arnaud Charlet Committed by Arnaud Charlet

* gcc-interface/Makefile.in: Target pairs clean ups.

From-SVN: r203541
parent 5164151f
2013-10-14 Arnaud Charlet <charlet@adacore.com>
* gcc-interface/Makefile.in: Target pairs clean ups.
2013-10-14 Vincent Celier <celier@adacore.com> 2013-10-14 Vincent Celier <celier@adacore.com>
* errout.adb (Write_Error_Summary): Do not output the number * errout.adb (Write_Error_Summary): Do not output the number
......
...@@ -495,6 +495,13 @@ endif ...@@ -495,6 +495,13 @@ endif
# PowerPC and e500v2 VxWorks # PowerPC and e500v2 VxWorks
ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $(target_os))),) ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $(target_os))),)
ifeq ($(strip $(filter-out e500%, $(arch))),)
ARCH_STR=e500
else
ARCH_STR=ppc
endif
LIBGNAT_TARGET_PAIRS = \ LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<a-intnam-vxworks.ads \ a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \ a-numaux.ads<a-numaux-vxworks.ads \
...@@ -547,7 +554,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ ...@@ -547,7 +554,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $
s-vxwext.ads<s-vxwext-rtp.ads \ s-vxwext.ads<s-vxwext-rtp.ads \
s-vxwext.adb<s-vxwext-rtp.adb \ s-vxwext.adb<s-vxwext-rtp.adb \
s-tpopsp.adb<s-tpopsp-vxworks-rtp.adb \ s-tpopsp.adb<s-tpopsp-vxworks-rtp.adb \
system.ads<system-vxworks-ppc-rtp.ads system.ads<system-vxworks-$(ARCH_STR)-rtp.ads
EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o
else else
...@@ -557,7 +564,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ ...@@ -557,7 +564,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $
s-vxwext.ads<s-vxwext-rtp.ads \ s-vxwext.ads<s-vxwext-rtp.ads \
s-vxwext.adb<s-vxwext-rtp-smp.adb \ s-vxwext.adb<s-vxwext-rtp-smp.adb \
s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \ s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
system.ads<system-vxworks-ppc-rtp.ads system.ads<system-vxworks-$(ARCH_STR)-rtp.ads
EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o EXTRA_GNATRTL_NONTASKING_OBJS=s-vxwexc.o
EXTRA_LIBGNAT_OBJS+=affinity.o EXTRA_LIBGNAT_OBJS+=affinity.o
...@@ -569,7 +576,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ ...@@ -569,7 +576,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $
s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \ s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
s-vxwext.ads<s-vxwext-kernel.ads \ s-vxwext.ads<s-vxwext-kernel.ads \
s-vxwext.adb<s-vxwext-kernel-smp.adb \ s-vxwext.adb<s-vxwext-kernel-smp.adb \
system.ads<system-vxworks-ppc-kernel.ads system.ads<system-vxworks-$(ARCH_STR)-kernel.ads
EH_MECHANISM=-gcc EH_MECHANISM=-gcc
EXTRA_LIBGNAT_OBJS+=affinity.o EXTRA_LIBGNAT_OBJS+=affinity.o
...@@ -583,7 +590,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ ...@@ -583,7 +590,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $
LIBGNAT_TARGET_PAIRS += \ LIBGNAT_TARGET_PAIRS += \
s-vxwext.ads<s-vxwext-kernel.ads \ s-vxwext.ads<s-vxwext-kernel.ads \
s-vxwext.adb<s-vxwext-kernel.adb \ s-vxwext.adb<s-vxwext-kernel.adb \
system.ads<system-vxworks-ppc-kernel.ads system.ads<system-vxworks-$(ARCH_STR)-kernel.ads
else else
LIBGNAT_TARGET_PAIRS += \ LIBGNAT_TARGET_PAIRS += \
system.ads<system-vxworks-ppc.ads system.ads<system-vxworks-ppc.ads
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment