Merge remote branch 'origin/develop' into bulldozer

This commit is contained in:
wernsaar 2013-12-01 16:56:21 +01:00
commit 9fbf437177
1 changed files with 30 additions and 0 deletions

View File

@ -373,6 +373,19 @@ NO_BINARY_MODE = 1
BINARY_DEFINED = 1 BINARY_DEFINED = 1
endif endif
ifeq ($(ARCH), arm)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
endif
ifeq ($(ARCH), arm64)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
endif
# #
# C Compiler dependent settings # C Compiler dependent settings
# #
@ -833,6 +846,19 @@ ifeq ($(DEBUG), 1)
COMMON_OPT += -g COMMON_OPT += -g
endif endif
ifndef COMMON_OPT
ifeq ($(ARCH), arm)
COMMON_OPT = -O3
endif
endif
ifndef COMMON_OPT
ifeq ($(ARCH), arm64)
COMMON_OPT = -O3
endif
endif
ifndef COMMON_OPT ifndef COMMON_OPT
COMMON_OPT = -O2 COMMON_OPT = -O2
endif endif
@ -958,6 +984,10 @@ export HAVE_SSE4_2
export HAVE_SSE4A export HAVE_SSE4A
export HAVE_SSE5 export HAVE_SSE5
export HAVE_AVX export HAVE_AVX
export HAVE_VFP
export HAVE_VFPV3
export HAVE_VFPV4
export HAVE_NEON
export KERNELDIR export KERNELDIR
export FUNCTION_PROFILE export FUNCTION_PROFILE
export TARGET_CORE export TARGET_CORE