aarch64: Add missing driver-aarch64 dependencies

Message ID 206e842c-e451-55a2-4712-f8847bd2190e@e124511.cambridge.arm.com
State Accepted
Headers
Series aarch64: Add missing driver-aarch64 dependencies |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Andrew Carlotti Dec. 5, 2023, 7:30 p.m. UTC
  Ok for master?

gcc/ChangeLog:

	* config/aarch64/x-aarch64: Add missing dependencies.
  

Comments

Richard Sandiford Dec. 9, 2023, 6:42 p.m. UTC | #1
Andrew Carlotti <andrew.carlotti@arm.com> writes:
> Ok for master?
>
> gcc/ChangeLog:
>
> 	* config/aarch64/x-aarch64: Add missing dependencies.
>
>
> diff --git a/gcc/config/aarch64/x-aarch64 b/gcc/config/aarch64/x-aarch64
> index 3cf701a0a01ab00eaaafdfad14bd90ebbb1d498f..6fd638faaab7cb5bb2309d36d6dea2adf1fb8d32 100644
> --- a/gcc/config/aarch64/x-aarch64
> +++ b/gcc/config/aarch64/x-aarch64
> @@ -1,3 +1,7 @@
>  driver-aarch64.o: $(srcdir)/config/aarch64/driver-aarch64.cc \
> -  $(CONFIG_H) $(SYSTEM_H)
> +  $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(CORETYPES_H) \
> +  $(srcdir)/config/aarch64/aarch64-protos.h \
> +  $(srcdir)/config/aarch64/aarch64-feature-deps.h \
> +  $(srcdir)/config/aarch64/aarch64-cores.def \
> +  $(srcdir)/config/aarch64/aarch64-arches.def

The .def files are included in TM_H by:

TM_H += $(srcdir)/config/aarch64/aarch64-fusion-pairs.def \
	$(srcdir)/config/aarch64/aarch64-tuning-flags.def \
	$(srcdir)/config/aarch64/aarch64-option-extensions.def \
	$(srcdir)/config/aarch64/aarch64-cores.def \
	$(srcdir)/config/aarch64/aarch64-isa-modes.def \
	$(srcdir)/config/aarch64/aarch64-arches.def

so they aren't strictly needed.  If you'd prefer to include the
directly-included files anyway (can see the argument in favour of that),
then the list ought to include aarch64-option-extensions.def too.

OK whichever way you prefer.

Thanks,
Richard

>  	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $<
  

Patch

diff --git a/gcc/config/aarch64/x-aarch64 b/gcc/config/aarch64/x-aarch64
index 3cf701a0a01ab00eaaafdfad14bd90ebbb1d498f..6fd638faaab7cb5bb2309d36d6dea2adf1fb8d32 100644
--- a/gcc/config/aarch64/x-aarch64
+++ b/gcc/config/aarch64/x-aarch64
@@ -1,3 +1,7 @@ 
 driver-aarch64.o: $(srcdir)/config/aarch64/driver-aarch64.cc \
-  $(CONFIG_H) $(SYSTEM_H)
+  $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(CORETYPES_H) \
+  $(srcdir)/config/aarch64/aarch64-protos.h \
+  $(srcdir)/config/aarch64/aarch64-feature-deps.h \
+  $(srcdir)/config/aarch64/aarch64-cores.def \
+  $(srcdir)/config/aarch64/aarch64-arches.def
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $<