From 28eccd34faa42af5012ac8a3002e022131fb0b4f Mon Sep 17 00:00:00 2001
From: Jerome Lambourg <lambourg@adacore.com>
Date: Thu, 20 Nov 2014 15:57:55 +0000
Subject: [PATCH] Makefile.in: Add some support for VxWorks7.
2014-11-20 Jerome Lambourg <lambourg@adacore.com>
* gcc-interface/Makefile.in: Add some support for VxWorks7.
From-SVN: r217881
---
gcc/ada/ChangeLog | 4 ++++
gcc/ada/gcc-interface/Makefile.in | 17 +++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index cf6060da4370..8d72e443d42e 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-20 Jerome Lambourg <lambourg@adacore.com>
+
+ * gcc-interface/Makefile.in: Add some support for VxWorks7.
+
2014-11-20 Thomas Quinot <quinot@adacore.com>
* sem_ch13.adb, freeze.adb: Minor reformatting.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index e781ae0bdc2a..1e0214d108c7 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -945,7 +945,7 @@ ifeq ($(strip $(filter-out %86 wrs vxworks vxworks7,$(target_cpu) $(target_vendo
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-x86-kernel.ads
+ system.ads<$(SVX)-x86-kernel.ads
EXTRA_LIBGNAT_OBJS+=affinity.o
else
LIBGNAT_TARGET_PAIRS += \
@@ -970,12 +970,21 @@ ifeq ($(strip $(filter-out %86 wrs vxworks vxworks7,$(target_cpu) $(target_vendo
EXTRA_LIBGNAT_OBJS+=vx_stack_info.o
- GCC_SPEC_FILES+=vxworks-x86-link.spec
- GCC_SPEC_FILES+=vxworks-smp-x86-link.spec
+ ifneq ($(strip $(filter-out vxworks7%, $(target_os))),)
+ GCC_SPEC_FILES+=vxworks-x86-link.spec
+ GCC_SPEC_FILES+=vxworks-smp-x86-link.spec
+ endif
endif
# ARM VxWorks
ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(target_os))),)
+
+ ifeq ($(strip $(filter-out vxworks7%, $(target_os))),)
+ SVX=system-vxworks7
+ else
+ SVX=system-vxworks
+ endif
+
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
@@ -1010,7 +1019,7 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
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-arm-rtp-smp.ads
+ system.ads<$(SVX)-arm-rtp-smp.ads
EXTRA_LIBGNAT_OBJS+=affinity.o sigtramp-vxworks.o
EXTRA_LIBGNAT_SRCS+=sigtramp.h
--
GitLab