From a341f744ce0778f7c25ce0eff703f656c99fadb0 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Tue, 16 Jul 2013 11:21:51 +0200
Subject: [PATCH] Cortex A15: temporarily remove -mcpu switch again

Make compiler stop complaining about every compilation unit.

Fixes #810.
---
 base/mk/spec-cortex_a15.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/base/mk/spec-cortex_a15.mk b/base/mk/spec-cortex_a15.mk
index e1f31f2c1..93d6cabdd 100644
--- a/base/mk/spec-cortex_a15.mk
+++ b/base/mk/spec-cortex_a15.mk
@@ -10,7 +10,17 @@ SPECS += arm_v7a
 # add repository relative include paths
 REP_INC_DIR += include/cortex_a15
 
-CC_OPT += -mcpu=cortex-a15
+#
+# GCC versions up to 4.7.3 complain about conflicting command-line switches:
+#
+#   warning: switch -mcpu=cortex-a15 conflicts with -march=armv7-a switch [enabled by default]
+#
+# Therefore, do not specify the actual CPU and stay with just the architecture
+# for now.
+#
+# Reference: https://github.com/genodelabs/genode/issues/810
+#
+#CC_OPT += -mcpu=cortex-a15
 
 # include implied specs
 include $(call select_from_repositories,mk/spec-arm_v7a.mk)