From c451f4d6c1727bc908e111346a1087ee7ccc1b2c Mon Sep 17 00:00:00 2001
From: Sofiane Naci <sofiane.naci@arm.com>
Date: Thu, 1 Aug 2013 09:50:52 +0000
Subject: [PATCH] config.gcc (aarch64*-*-*): Add aarch-common.o to extra_objs.

	* config.gcc (aarch64*-*-*): Add aarch-common.o to extra_objs.  Add
	aarch-common-protos.h to extra_headers.
	(aarch64*-*-*): Add arm/aarch-common-protos.h to tm_p_file.
	* config/aarch64/aarch64.md: Include "../arm/cortex-a53.md"
	* config/aarch64/t-aarch64 (aarch-common.o): Define.

From-SVN: r201400
---
 gcc/ChangeLog                 | 8 ++++++++
 gcc/config.gcc                | 3 ++-
 gcc/config/aarch64/aarch64.md | 1 +
 gcc/config/aarch64/t-aarch64  | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1ba4e06ff00..592bd313548 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-01  Sofiane Naci  <sofiane.naci@arm.com>
+
+	* config.gcc (aarch64*-*-*): Add aarch-common.o to extra_objs.  Add
+	aarch-common-protos.h to extra_headers.
+	(aarch64*-*-*): Add arm/aarch-common-protos.h to tm_p_file.
+	* config/aarch64/aarch64.md: Include "../arm/cortex-a53.md".
+	* config/aarch64/t-aarch64 (aarch-common.o): Define.
+
 2013-08-01  Sofiane Naci  <sofiane.naci@arm.com>
 
 	* config/aarch64/aarch64.md (define_attr "type"): Delete.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index fda3c6e0fb8..ef37e613de4 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -313,7 +313,7 @@ aarch64*-*-*)
 	cpu_type=aarch64
 	need_64bit_hwint=yes
 	extra_headers="arm_neon.h"
-	extra_objs="aarch64-builtins.o"
+	extra_objs="aarch64-builtins.o aarch-common.o"
 	target_has_targetm_common=yes
 	;;
 alpha*-*-*)
@@ -501,6 +501,7 @@ fi
 
 case ${target} in
 aarch64*-*-*)
+	tm_p_file="${tm_p_file} arm/aarch-common-protos.h"
 	case ${with_abi} in
 	"")
 		if test "x$with_multilib_list" = xilp32; then
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index 7266d383fc6..5312a796ed9 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -310,6 +310,7 @@
 (include "aarch64-generic.md")
 (include "large.md")
 (include "small.md")
+(include "../arm/cortex-a53.md")
 
 ;; -------------------------------------------------------------------
 ;; Jumps and other miscellaneous insns
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
index 2975850dcb9..9f8d8cd6e0d 100644
--- a/gcc/config/aarch64/t-aarch64
+++ b/gcc/config/aarch64/t-aarch64
@@ -35,6 +35,11 @@ aarch64-builtins.o: $(srcdir)/config/aarch64/aarch64-builtins.c $(CONFIG_H) \
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 		$(srcdir)/config/aarch64/aarch64-builtins.c
 
+aarch-common.o: $(srcdir)/config/arm/aarch-common.c $(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.c
+
 comma=,
 MULTILIB_OPTIONS    = $(patsubst %, mabi=%, $(subst $(comma), ,$(TM_MULTILIB_CONFIG)))
 MULTILIB_DIRNAMES   = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
-- 
2.30.2