Preserve cpu specific CRTSTUFF_T_CFLAGS on powerpc-vxworks7

The unconditional assignment performed in t-vxworks to handle
include flags currently overrides what specific cpu ports had
for the regular (!vxworks) crtstuff objects.

This was not done on purpose and the proposed change adjusts the
configuration bits to apply the vxworks specific flags on top of
the cpu ones instead.

2021-12-07  Olivier Hainque  <hainque@adacore.com>

	* config.host (powerpc*-wrs-vxworks7*): Place t-crtstuff
	ahead of the other files in tmake_files.
	* config/t-vxworks: Add to CRTSTUFF_T_CFLAGS instead of
	overriding it.
This commit is contained in:
Olivier Hainque 2021-12-07 13:26:30 +00:00
parent 16c848090f
commit 0ecb48d753
2 changed files with 5 additions and 2 deletions

View File

@ -1235,7 +1235,8 @@ powerpc*-*-linux*)
md_unwind_header=rs6000/linux-unwind.h
;;
powerpc*-wrs-vxworks7*)
tmake_file="$tmake_file rs6000/t-vxworks rs6000/t-savresfgpr rs6000/t-crtstuff rs6000/t-linux t-dfprules rs6000/t-ppc64-fp t-slibgcc-libgcc"
tmake_file="$tmake_file rs6000/t-vxworks rs6000/t-savresfgpr rs6000/t-linux t-dfprules rs6000/t-ppc64-fp t-slibgcc-libgcc"
tmake_file="rs6000/t-crtstuff ${tmake_file}"
case $ppc_fp_type in
64)
;;

View File

@ -17,4 +17,6 @@ LIBGCC2_INCLUDES = -nostdinc -I. \
-I$(VSB_DIR)/h -I$(VSB_DIR)/share/h -I=/system -I=/public, \
-I=/ -I=/wrn/coreip)
CRTSTUFF_T_CFLAGS = $(LIBGCC2_INCLUDES)
# Use these also for the vxcrstuff objects (.e.g for version.h), on top of
# the options possibly already set specifically for the target:
CRTSTUFF_T_CFLAGS += $(LIBGCC2_INCLUDES)