OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* gcc-interface/Makefile.in: Cleanup VxWorks targets.

Browse Source 
From-SVN: r247186
This commit is contained in:
Arnaud Charlet 2017-04-25 11:03:52 +00:00 committed by Arnaud Charlet
parent cc0b3bac55
commit 6948bc18f0
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ada/ChangeLog
View File

@ -1,3 +1,7 @@
2017-04-25 Arnaud Charlet <charlet@adacore.com>
* gcc-interface/Makefile.in: Cleanup VxWorks targets.
2017-04-25 Eric Botcazou <ebotcazou@adacore.com>
* fname.adb (Is_Internal_File_Name): Arrange for the slices to

23
gcc/ada/gcc-interface/Makefile.in
View File

@ -517,8 +517,16 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
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
ARCH_STR=ppc
ifeq ($(strip $(filter-out powerpc64, $(target_cpu))),)
ARCH_STR=ppc64
else
ARCH_STR=ppc
endif
endif
ifeq ($(strip $(filter-out vxworks7%, $(target_os))),)
@ -622,8 +630,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
system.ads<system-vxworks-ppc.ads
endif
endif
EXTRA_GNATRTL_NONTASKING_OBJS=i-vxinco.o i-vxwork.o i-vxwoio.o
EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o s-vxwext.o
EXTRA_GNATRTL_NONTASKING_OBJS+=i-vxinco.o i-vxwork.o i-vxwoio.o
endif
endif
@ -645,10 +652,14 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
endif
# PowerPC and e500v2 VxWorks 653
ifeq ($(strip $(filter-out powerpc% wrs vxworksae,$(target_cpu) $(target_vendor) $(target_os))),)
ifeq ($(strip $(filter-out powerpc% wrs vxworksae vxworksaespe,$(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
ARCH_STR=ppc
endif
@ -2494,7 +2505,6 @@ ADA_EXCLUDE_SRCS =\
g-altive.ads g-alveop.adb g-alveop.ads g-alvety.ads g-alvevi.ads \
g-intpri.ads g-regist.adb g-regist.ads g-sse.ads g-ssvety.ads \
i-vxinco.adb i-vxinco.ads i-vxwoio.adb i-vxwoio.ads i-vxwork.ads \
i-bit_types.ads \
s-bb.ads s-bbbosu.ads s-bbcaco.ads s-bbcppr.ads s-bbexti.adb \
s-bbexti.ads s-bbinte.adb s-bbinte.ads s-bbprot.adb s-bbprot.ads \
s-bbsle3.ads s-bbsuer.ads s-bbsule.ads s-bbthqu.adb s-bbthqu.ads \
@ -2506,8 +2516,7 @@ ADA_EXCLUDE_SRCS =\
s-memcom.adb s-memcom.ads s-memmov.adb s-memmov.ads s-memset.adb \
s-memset.ads s-mufalo.adb s-mufalo.ads s-musplo.adb s-musplo.ads \
s-sam4.ads s-sopco3.adb s-sopco3.ads s-sopco4.adb s-sopco4.ads \
s-sopco5.adb s-sopco5.ads s-stchop.ads s-stchop.adb \
s-stm32.ads \
s-sopco5.adb s-sopco5.ads s-stchop.ads s-stchop.adb s-stm32.ads \
s-strcom.adb s-strcom.ads s-thread.ads \
s-vxwexc.adb s-vxwexc.ads s-vxwext.adb s-vxwext.ads \
s-win32.ads s-winext.ads