From 1e3c80ff5b031c6e28eb75ef43e915e6e2e9a473 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Wed, 18 Feb 2015 14:37:13 +0100
Subject: [PATCH] arm: enable cpu cortex_a15 compiler flag

To enable the usage of virtualization extension related instructions
there is the need to enable the '-mcpu=cortex_a15' compiler flag on
those cpus. To not conflict with other compiler flags (Ref #810) we've
to disable the '-march=arm_v7a' flag.

Ref #1405
---
 repos/base/mk/spec-arm_v7a.mk       | 3 ---
 repos/base/mk/spec-cortex_a15.mk    | 7 +++----
 repos/base/mk/spec-cortex_a8.mk     | 3 ++-
 repos/base/mk/spec-cortex_a9.mk     | 3 ++-
 repos/dde_rump/lib/mk/rump_base.inc | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/repos/base/mk/spec-arm_v7a.mk b/repos/base/mk/spec-arm_v7a.mk
index 148fb52e6..62bcad718 100644
--- a/repos/base/mk/spec-arm_v7a.mk
+++ b/repos/base/mk/spec-arm_v7a.mk
@@ -7,9 +7,6 @@
 # denote wich specs are also fullfilled by this spec
 SPECS += arm_v7
 
-# configure compiler
-CC_MARCH += -march=armv7-a
-
 # add repository relative include paths
 REP_INC_DIR += include/arm_v7a
 
diff --git a/repos/base/mk/spec-cortex_a15.mk b/repos/base/mk/spec-cortex_a15.mk
index 93d6cabdd..56b86ae26 100644
--- a/repos/base/mk/spec-cortex_a15.mk
+++ b/repos/base/mk/spec-cortex_a15.mk
@@ -10,18 +10,17 @@ SPECS += arm_v7a
 # add repository relative include paths
 REP_INC_DIR += include/cortex_a15
 
+# configure compiler
 #
 # 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.
+# Therefore, do not specify the actual CPU and the architecture together.
 #
 # Reference: https://github.com/genodelabs/genode/issues/810
 #
-#CC_OPT += -mcpu=cortex-a15
+CC_MARCH += -mcpu=cortex-a15
 
 # include implied specs
 include $(call select_from_repositories,mk/spec-arm_v7a.mk)
-
diff --git a/repos/base/mk/spec-cortex_a8.mk b/repos/base/mk/spec-cortex_a8.mk
index 553b828c6..c68113c33 100644
--- a/repos/base/mk/spec-cortex_a8.mk
+++ b/repos/base/mk/spec-cortex_a8.mk
@@ -10,7 +10,8 @@ SPECS += arm_v7a
 # add repository relative include paths
 REP_INC_DIR += include/cortex_a8
 
-CC_OPT += -mcpu=cortex-a8
+# configure compiler
+CC_MARCH += -march=armv7-a -mcpu=cortex-a8
 
 # include implied specs
 include $(call select_from_repositories,mk/spec-arm_v7a.mk)
diff --git a/repos/base/mk/spec-cortex_a9.mk b/repos/base/mk/spec-cortex_a9.mk
index 6101cbfaf..7ffed9621 100644
--- a/repos/base/mk/spec-cortex_a9.mk
+++ b/repos/base/mk/spec-cortex_a9.mk
@@ -10,7 +10,8 @@ SPECS += arm_v7a pl390
 # add repository relative include paths
 REP_INC_DIR += include/cortex_a9
 
-CC_OPT += -mcpu=cortex-a9
+# configure compiler
+CC_MARCH += -march=armv7-a -mcpu=cortex-a9
 
 # include implied specs
 include $(call select_from_repositories,mk/spec-arm_v7a.mk)
diff --git a/repos/dde_rump/lib/mk/rump_base.inc b/repos/dde_rump/lib/mk/rump_base.inc
index 94fcbf884..5ec910b5f 100644
--- a/repos/dde_rump/lib/mk/rump_base.inc
+++ b/repos/dde_rump/lib/mk/rump_base.inc
@@ -35,7 +35,7 @@ BUILD_CMD = BUILD_CC=cc BUILD_AR=ar BUILD_NM=nm BUILD_OBJCOPY=objcopy \
 # Linkage
 #
 ARCHIVE = $(RUMP_LIB)/librump.a
-CC_OPT  = -DLIBRUMPUSER
+CC_OPT += -DLIBRUMPUSER
 
 
 INCSDIRS = adosfs altq arpa crypto dev evbarm filecorefs fs i386 isofs miscfs \