From 649d123da5ab1a2aaf920ab441b602eae0a45d4c Mon Sep 17 00:00:00 2001
From: Peter Chubb <peter.chubb@nicta.com.au>
Date: Fri, 25 Jul 2014 09:51:04 +1000
Subject: [PATCH] Fix compilation errors on Cortex-A8

Different version of GCC need diffferent combinations of -mcpu
-mtune= and -march to build properly for KZM (armv6) and cortex-a8

Make CFLAGS and ASFLAGS consistent, and rely on GCC knowing which arch is which
wwhen told what CPU to build for.
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 31f3219bf..2584ca994 100644
--- a/Makefile
+++ b/Makefile
@@ -339,16 +339,14 @@ DEFINES += -DFASTPATH
 endif
 
 ifeq (${ARCH}, arm)
-CFLAGS += -mtune=${CPU} -marm
+CFLAGS += -mtune=${CPU} -marm -mcpu=${CPU}
 ASFLAGS += -mcpu=${CPU}
 DEFINES += -D$(shell echo ${ARMV}|tr [:lower:] [:upper:]|tr - _)
 ifeq (${CPU},cortex-a8)
 DEFINES += -DARM_CORTEX_A8
-CFLAGS += -march=${ARCH}
 else
 ifeq (${CPU},cortex-a9)
 DEFINES += -DARM_CORTEX_A9
-CFLAGS += -march=${ARCH}
 endif
 endif
 endif