This also improves consistency of the compile commands, and eliminates an ALL_SPPFLAGS typo.
gcc/ChangeLog: * config/aarch64/t-aarch64: Use $(COMPILE) and $(POSTCOMPILE) diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64 index 59571948479c0857df2cca70b18df6c5d9a7254c..a70c323ad0ad6be7d887645b6866112105f4f805 100644 --- a/gcc/config/aarch64/t-aarch64 +++ b/gcc/config/aarch64/t-aarch64 @@ -57,8 +57,8 @@ aarch64-builtins.o: $(srcdir)/config/aarch64/aarch64-builtins.cc $(CONFIG_H) \ $(srcdir)/config/aarch64/aarch64-simd-builtin-types.def \ $(srcdir)/config/aarch64/aarch64-simd-pragma-builtins.def \ aarch64-builtin-iterators.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-builtins.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-sve-builtins.o: $(srcdir)/config/aarch64/aarch64-sve-builtins.cc \ $(srcdir)/config/aarch64/aarch64-sve-builtins.def \ @@ -76,8 +76,8 @@ aarch64-sve-builtins.o: $(srcdir)/config/aarch64/aarch64-sve-builtins.cc \ $(srcdir)/config/aarch64/aarch64-sve-builtins-base.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-sve2.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-sme.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-sve-builtins.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-sve-builtins-shapes.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-shapes.cc \ @@ -85,8 +85,8 @@ aarch64-sve-builtins-shapes.o: \ $(TM_P_H) memmodel.h insn-codes.h $(OPTABS_H) \ $(srcdir)/config/aarch64/aarch64-sve-builtins.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-shapes.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-sve-builtins-shapes.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-sve-builtins-base.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-base.cc \ @@ -99,8 +99,8 @@ aarch64-sve-builtins-base.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-shapes.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-base.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-functions.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-sve-builtins-base.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-sve-builtins-sve2.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-sve2.cc \ @@ -113,8 +113,8 @@ aarch64-sve-builtins-sve2.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-shapes.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-sve2.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-functions.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-sve-builtins-sve2.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-sve-builtins-sme.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-sme.cc \ @@ -126,8 +126,8 @@ aarch64-sve-builtins-sme.o: \ $(srcdir)/config/aarch64/aarch64-sve-builtins-shapes.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-sme.h \ $(srcdir)/config/aarch64/aarch64-sve-builtins-functions.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-sve-builtins-sme.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-builtin-iterators.h: $(srcdir)/config/aarch64/geniterators.sh \ $(srcdir)/config/aarch64/iterators.md @@ -137,13 +137,13 @@ aarch64-builtin-iterators.h: $(srcdir)/config/aarch64/geniterators.sh \ aarch-common.o: $(srcdir)/config/arm/aarch-common.cc $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TM_P_H) $(RTL_H) $(TREE_H) output.h $(C_COMMON_H) - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/arm/aarch-common.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-c.o: $(srcdir)/config/aarch64/aarch64-c.cc $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) output.h $(C_COMMON_H) $(TARGET_H) - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-c.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-d.o: $(srcdir)/config/aarch64/aarch64-d.cc $(COMPILE) $< @@ -157,8 +157,8 @@ cortex-a57-fma-steering.o: $(srcdir)/config/aarch64/cortex-a57-fma-steering.cc \ output.h hash-map.h $(DF_H) $(OBSTACK_H) $(TARGET_H) $(RTL_H) \ $(CONTEXT_H) $(TREE_PASS_H) regrename.h \ $(srcdir)/config/aarch64/aarch64-protos.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/cortex-a57-fma-steering.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-speculation.o: $(srcdir)/config/aarch64/aarch64-speculation.cc \ $(CONFIG_H) \ @@ -167,8 +167,8 @@ aarch64-speculation.o: $(srcdir)/config/aarch64/aarch64-speculation.cc \ $(TARGET_H) \ $(RTL_BASE_H) \ $(TREE_PASS_H) - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_SPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-speculation.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch-bti-insert.o: $(srcdir)/config/arm/aarch-bti-insert.cc \ $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(REGS_H) insn-config.h $(RTL_BASE_H) \ @@ -176,26 +176,26 @@ aarch-bti-insert.o: $(srcdir)/config/arm/aarch-bti-insert.cc \ output.h hash-map.h $(DF_H) $(OBSTACK_H) $(TARGET_H) $(RTL_H) \ $(CONTEXT_H) $(TREE_PASS_H) regrename.h \ $(srcdir)/config/aarch64/aarch64-protos.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/arm/aarch-bti-insert.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \ $(CONFIG_H) $(SYSTEM_H) $(CORETYPES_H) $(BACKEND_H) $(RTL_H) $(DF_H) \ $(RTL_SSA_H) tree-pass.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-cc-fusion.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-early-ra.o: $(srcdir)/config/aarch64/aarch64-early-ra.cc \ $(CONFIG_H) $(SYSTEM_H) $(CORETYPES_H) $(BACKEND_H) $(RTL_H) $(DF_H) \ $(RTL_SSA_H) tree-pass.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-early-ra.cc + $(COMPILE) $< + $(POSTCOMPILE) aarch64-ldp-fusion.o: $(srcdir)/config/aarch64/aarch64-ldp-fusion.cc \ $(CONFIG_H) $(SYSTEM_H) $(CORETYPES_H) $(BACKEND_H) $(RTL_H) \ tree-pass.h pair-fusion.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/aarch64/aarch64-ldp-fusion.cc + $(COMPILE) $< + $(POSTCOMPILE) comma=, MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))