diff --git a/gcc/config/aarch64/darwin.h b/gcc/config/aarch64/darwin.h
index 96101ce2809fe..f2576331bae77 100644
--- a/gcc/config/aarch64/darwin.h
+++ b/gcc/config/aarch64/darwin.h
@@ -236,3 +236,8 @@ along with GCC; see the file COPYING3.  If not see
 
 #undef ASM_OUTPUT_DEF_FROM_DECLS
 
+#undef CLEAR_INSN_CACHE
+#define CLEAR_INSN_CACHE(beg, end)				\
+  extern void sys_icache_invalidate(void *start, size_t len);	\
+  sys_icache_invalidate ((beg), (size_t)((end)-(beg)))
+
diff --git a/libgcc/config.host b/libgcc/config.host
index d0bb013da41b7..a3b84ad2adbd7 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -410,7 +410,6 @@ aarch64*-*-elf | aarch64*-*-rtems*)
 	;;
 aarch64*-*darwin* | arm64*-*darwin* )
 	extra_parts="$extra_parts crtfastmath.o"
-	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
 	tmake_file="${tmake_file} ${cpu_type}/t-lse "
 	tmake_file="${tmake_file} t-crtfm"
 	# No soft float for now because our long double is DF not TF.