diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2013-10-14 13:14:36 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-10-14 15:14:36 +0200 |
| commit | ffd76236927edd3e91599aa12ef4c520e9846a3f (patch) | |
| tree | cf58d01c23895faed15374b49db939ab43c4eaa0 /gcc | |
| parent | 5164151f87bf8872c5e0749dd30730bce79cb5b8 (diff) | |
| download | gcc-ffd76236927edd3e91599aa12ef4c520e9846a3f.zip gcc-ffd76236927edd3e91599aa12ef4c520e9846a3f.tar.gz gcc-ffd76236927edd3e91599aa12ef4c520e9846a3f.tar.bz2 | |
* gcc-interface/Makefile.in: Target pairs clean ups.
From-SVN: r203541
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 695f9a2..d9fdda2 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2013-10-14 Arnaud Charlet <charlet@adacore.com> + + * gcc-interface/Makefile.in: Target pairs clean ups. + 2013-10-14 Vincent Celier <celier@adacore.com> * errout.adb (Write_Error_Summary): Do not output the number diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 067d5a1..f047372 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -495,6 +495,13 @@ endif # PowerPC and e500v2 VxWorks 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 = \ a-intnam.ads<a-intnam-vxworks.ads \ a-numaux.ads<a-numaux-vxworks.ads \ @@ -547,7 +554,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ s-vxwext.ads<s-vxwext-rtp.ads \ s-vxwext.adb<s-vxwext-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 else @@ -557,7 +564,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ s-vxwext.ads<s-vxwext-rtp.ads \ s-vxwext.adb<s-vxwext-rtp-smp.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_LIBGNAT_OBJS+=affinity.o @@ -569,7 +576,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \ s-vxwext.ads<s-vxwext-kernel.ads \ 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 EXTRA_LIBGNAT_OBJS+=affinity.o @@ -583,7 +590,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ LIBGNAT_TARGET_PAIRS += \ s-vxwext.ads<s-vxwext-kernel.ads \ s-vxwext.adb<s-vxwext-kernel.adb \ - system.ads<system-vxworks-ppc-kernel.ads + system.ads<system-vxworks-$(ARCH_STR)-kernel.ads else LIBGNAT_TARGET_PAIRS += \ system.ads<system-vxworks-ppc.ads |