From 495cb74f2703430e6cc6b392b8efb08b1940fbc4 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Tue, 7 Dec 2021 13:26:30 +0000 Subject: [PATCH] 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 * 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. --- libgcc/config.host | 3 ++- libgcc/config/t-vxworks | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libgcc/config.host b/libgcc/config.host index 1c1b60cac0b..a94f4bf41db 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -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) ;; diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index aa794744976..18a0b1ee469 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -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) -- 2.25.1