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

Makefile.in: Merge Aarch64 and ARM "ifeq" blocks.

Browse Source 
2017-11-16  Doug Rupp  <rupp@adacore.com>

	* gcc-interface/Makefile.in: Merge Aarch64 and ARM "ifeq" blocks.

From-SVN: r254829
This commit is contained in:
Doug Rupp 2017-11-16 16:06:48 +00:00 committed by Pierre-Marie de Rodat
parent d2ca577995
commit 79cefe9d7d
2 changed files with 37 additions and 16 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-11-16 Doug Rupp <rupp@adacore.com>
* gcc-interface/Makefile.in: Merge Aarch64 and ARM "ifeq" blocks.
2017-11-16 Steve Baird <baird@adacore.com>
* debug.adb: Update another comment to indicate gnat2scil's use of the

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

@ -763,17 +763,29 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe
endif
endif
# ARM VxWorks
ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(target_os))),)
# ARM and Aarch64 VxWorks
ifeq ($(strip $(filter-out aarch64 arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(target_os))),)
ifeq ($(strip $(filter-out vxworks7%, $(target_os))),)
SVX=system-vxworks7
EH_MECHANISM=-arm
SIGTRAMP_OBJ=sigtramp-armvxworks.o
ifeq ($(strip $(filter-out aarch64, $(target_cpu))),)
ARCH_STR=aarch64
SVX=system-vxworks7
EH_MECHANISM=-gcc
SIGTRAMP_OBJ=sigtramp-vxworks.o
else
SVX=system-vxworks
EH_MECHANISM=-gcc
SIGTRAMP_OBJ=sigtramp-vxworks.o
ifeq ($(strip $(filter-out arm%, $(target_cpu))),)
ARCH_STR=arm
ifeq ($(strip $(filter-out vxworks7%, $(target_os))),)
SVX=system-vxworks7
EH_MECHANISM=-arm
SIGTRAMP_OBJ=sigtramp-armvxworks.o
else
SVX=system-vxworks
EH_MECHANISM=-gcc
SIGTRAMP_OBJ=sigtramp-vxworks.o
endif
else
ARCH_STR=coff
endif
endif
LIBGNAT_TARGET_PAIRS = \
@ -793,7 +805,7 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
s-taprop.adb<libgnarl/s-taprop__vxworks.adb \
s-tasinf.ads<libgnarl/s-tasinf__vxworks.ads \
s-taspri.ads<libgnarl/s-taspri__vxworks.ads \
s-vxwork.ads<libgnarl/s-vxwork__arm.ads \
s-vxwork.ads<libgnarl/s-vxwork__$(ARCH_STR).ads \
g-socthi.ads<libgnat/g-socthi__vxworks.ads \
g-socthi.adb<libgnat/g-socthi__vxworks.adb \
g-stsifd.adb<libgnat/g-stsifd__sockets.adb
@ -806,7 +818,7 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \
s-vxwext.adb<libgnarl/s-vxwext__rtp-smp.adb \
s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \
system.ads<libgnat/$(SVX)-arm-rtp-smp.ads
system.ads<libgnat/$(SVX)-$(ARCH_STR)-rtp-smp.ads
EXTRA_LIBGNAT_OBJS+=affinity.o
@ -819,7 +831,7 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \
s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \
s-vxwext.adb<libgnarl/s-vxwext__kernel-smp.adb \
system.ads<libgnat/$(SVX)-arm.ads
system.ads<libgnat/$(SVX)-$(ARCH_STR).ads
EXTRA_LIBGNAT_OBJS+=affinity.o
@ -828,7 +840,7 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
else
LIBGNAT_TARGET_PAIRS += \
s-tpopsp.adb<libgnarl/s-tpopsp__vxworks.adb \
system.ads<libgnat/$(SVX)-arm.ads
system.ads<libgnat/$(SVX)-$(ARCH_STR).ads
ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
LIBGNAT_TARGET_PAIRS += \
@ -847,15 +859,20 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
EXTRA_LIBGNAT_OBJS+=vx_stack_info.o
ifeq ($(strip $(filter-out vxworks7%, $(target_os))),)
ifeq ($(strip $(filter-out arm vxworks7%, $(target_cpu) $(target_os))),)
GCC_SPEC_FILES+=vxworks7-rtp-base-link.spec
else
ifeq ($(strip $(filter-out aarch64, $(target_cpu))),)
GCC_SPEC_FILES+=vxworks7-rtp-base-link.spec
endif
EXTRA_ADALIB_OBJS+=$(VX_CRTBE_EXTRA_ADALIB_OBJS)
EXTRA_LIBGNAT_SRCS+=vx_crtbegin.inc
GCC_SPEC_FILES+=vxworks-gnat-crtbe-link.spec
GCC_SPEC_FILES+=vxworks-arm-link.spec
GCC_SPEC_FILES+=vxworks-smp-arm-link.spec
ifneq ($(strip $(filter-out vxworks7%, $(target_os))),)
GCC_SPEC_FILES+=vxworks-arm-link.spec
GCC_SPEC_FILES+=vxworks-smp-arm-link.spec
endif
endif
endif