ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base: remove cortex* compiler flags (fix #2787)

Browse Source
This commit is contained in:
Stefan Kalkowski 2018-04-30 14:57:40 +02:00 committed by Christian Helmuth
parent ad1b958b81
commit 68015a6e9d
18 changed files with 37 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/base-hw/lib/mk/spec/arndale/bootstrap-hw.mk
View File

@ -9,4 +9,10 @@ SRC_S += bootstrap/spec/arm/crt0.s
NR_OF_CPUS = 2
#
# we need more specific compiler hints for some 'special' assembly code
# override -march=armv7-a because it conflicts with -mcpu=cortex-a15
#
CC_MARCH = -mcpu=cortex-a15
include $(REP_DIR)/lib/mk/bootstrap-hw.inc

6
repos/base-hw/lib/mk/spec/arndale/core-hw.mk
View File

@ -21,5 +21,11 @@ SRC_S += spec/arm_v7/virtualization/exception_vector.s
NR_OF_CPUS = 2
#
# we need more specific compiler hints for some 'special' assembly code
# override -march=armv7-a because it conflicts with -mcpu=cortex-a15
#
CC_MARCH = -mcpu=cortex-a15
# include less specific configuration
include $(REP_DIR)/lib/mk/spec/exynos5/core-hw.inc

2
repos/base-hw/lib/mk/spec/panda/bootstrap-hw.mk
View File

@ -9,4 +9,6 @@ SRC_CC += hw/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
SRC_S += bootstrap/spec/arm/crt0.s
CC_MARCH = -mcpu=cortex-a9
include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc

2
repos/base-hw/lib/mk/spec/panda/core-hw.mk
View File

@ -13,5 +13,7 @@ SRC_CC += platform_services.cc
NR_OF_CPUS += 2
CC_MARCH = -mcpu=cortex-a9
# include less specific configuration
include $(REP_DIR)/lib/mk/spec/cortex_a9/core-hw.inc

6
repos/base/mk/spec/arm_v6.mk
View File

@ -1,8 +1,6 @@
SPECS += arm
CC_MARCH += -march=armv6k
SPECS += arm
REP_INC_DIR += include/spec/arm_v6
CC_MARCH ?= -march=armv6k
include $(BASE_DIR)/mk/spec/arm.mk

3
repos/base/mk/spec/arm_v7.mk
View File

@ -1,5 +1,4 @@
SPECS += arm
SPECS += arm
REP_INC_DIR += include/spec/arm_v7
include $(BASE_DIR)/mk/spec/arm.mk

7
repos/base/mk/spec/arm_v7a.mk
View File

@ -1,8 +1,5 @@
SPECS += arm_v7
REP_INC_DIR += include/spec/arm_v7a
CC_MARCH += -march=armv7-a
SPECS += arm_v7
CC_MARCH ?= -march=armv7-a
include $(BASE_DIR)/mk/spec/arm_v7.mk

17
repos/base/mk/spec/cortex_a15.mk
View File

@ -1,17 +0,0 @@
SPECS += arm_v7a
REP_INC_DIR += include/spec/cortex_a15
include $(BASE_DIR)/mk/spec/arm_v7a.mk
# 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, we override the 'CC_MARCH' of the included 'arm_v7a.mk'.
#
# Reference: https://github.com/genodelabs/genode/issues/810
#
CC_MARCH := -march=armv7ve -mcpu=cortex-a15

7
repos/base/mk/spec/cortex_a8.mk
View File

@ -1,7 +0,0 @@
SPECS += arm_v7a
REP_INC_DIR += include/spec/cortex_a8
CC_MARCH += -march=armv7-a -mcpu=cortex-a8
include $(BASE_DIR)/mk/spec/arm_v7a.mk

8
repos/base/mk/spec/cortex_a9.mk
View File

@ -1,8 +0,0 @@
SPECS += arm_v7a
REP_INC_DIR += include/spec/cortex_a9
CC_MARCH += -mcpu=cortex-a9
include $(BASE_DIR)/mk/spec/arm_v7a.mk

4
repos/base/mk/spec/exynos5.mk
View File

@ -1,5 +1,5 @@
SPECS += cortex_a15 framebuffer usb
SPECS += arm_v7a framebuffer usb
REP_INC_DIR += include/spec/exynos5
include $(BASE_DIR)/mk/spec/cortex_a15.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

4
repos/base/mk/spec/imx53.mk
View File

@ -1,6 +1,6 @@
SPECS += cortex_a8 gpio framebuffer
SPECS += arm_v7a gpio framebuffer
REP_INC_DIR += include/spec/imx53
include $(BASE_DIR)/mk/spec/cortex_a8.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

5
repos/base/mk/spec/imx6.mk
View File

@ -1,6 +1,5 @@
SPECS += cortex_a9 gpio
SPECS += arm_v7a gpio
REP_INC_DIR += include/spec/imx6
include $(BASE_DIR)/mk/spec/cortex_a9.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

4
repos/base/mk/spec/odroid_x2.mk
View File

@ -1,6 +1,6 @@
SPECS += exynos4 cortex_a9 usb framebuffer gpio
SPECS += arm_v7a exynos4 usb framebuffer gpio
REP_INC_DIR += include/spec/odroid_x2
REP_INC_DIR += include/spec/exynos4
include $(BASE_DIR)/mk/spec/cortex_a9.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

3
repos/base/mk/spec/panda.mk
View File

@ -1,7 +1,7 @@
#
# Enable peripherals of the platform
#
SPECS += omap4 usb cortex_a9 panda gpio framebuffer
SPECS += omap4 usb panda gpio framebuffer
#
# Pull in CPU specifics
@ -13,5 +13,4 @@ SPECS += arm_v7a
#
REP_INC_DIR += include/spec/panda
include $(BASE_DIR)/mk/spec/cortex_a9.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

4
repos/base/mk/spec/pbxa9.mk
View File

@ -6,11 +6,11 @@ SPECS += pl050 pl11x ps2 pl180 lan9118 framebuffer
#
# Pull in CPU specifics
#
SPECS += cortex_a9
SPECS += arm_v7a
#
# Add device parameters to include search path
#
REP_INC_DIR += include/spec/pbxa9
include $(BASE_DIR)/mk/spec/cortex_a9.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

4
repos/base/mk/spec/zynq.mk
View File

@ -1,8 +1,8 @@
#
# Pull in CPU specifics
#
SPECS += cortex_a9 arm_v7a
SPECS += arm_v7a
REP_INC_DIR += include/spec/zynq
include $(BASE_DIR)/mk/spec/cortex_a9.mk
include $(BASE_DIR)/mk/spec/arm_v7a.mk

5
repos/os/src/server/vmm/test/kernel/target.mk
View File

@ -1,3 +1,4 @@
TARGET = test-kernel
REQUIRES = hw_arndale
TARGET = vmm-test-kernel
REQUIRES = arm_v7
SRC_S = main.s
CC_MARCH = -mcpu=cortex-a15