p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enable cortex branch predition errata workaround for armv7-a builds 

Signed-off-by: Erik Gilling <konkers@android.com>
This commit is contained in:
Erik Gilling 2009-07-17 15:57:10 -07:00
parent 4d221e8e28
commit c12c518379
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/combo/arch/arm/armv7-a.mk
View File

@ -17,3 +17,6 @@ arch_variant_cflags := \
-march=armv7-a \ -march=armv7-a \
-mfloat-abi=softfp \ -mfloat-abi=softfp \
-mfpu=neon -mfpu=neon
arch_variant_ldflags := \
-Wl,--fix-cortex-a8

6
core/combo/linux-arm.mk
View File

@ -96,6 +96,9 @@ $(combo_target)GLOBAL_CFLAGS += \
-include $(android_config_h) \ -include $(android_config_h) \
-I $(arch_include_dir) -I $(arch_include_dir)
$(combo_target)GLOBAL_LDFLAGS += \
$(arch_variant_ldflags)
# We only need thumb interworking in cases where thumb support # We only need thumb interworking in cases where thumb support
# is available in the architecture, and just to be sure, (and # is available in the architecture, and just to be sure, (and
# since sometimes thumb-interwork appears to be default), we # since sometimes thumb-interwork appears to be default), we
@ -177,6 +180,7 @@ $(TARGET_CXX) \
$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
-o $@ \ -o $@ \
$(PRIVATE_LDFLAGS) \ $(PRIVATE_LDFLAGS) \
$(TARGET_GLOBAL_LDFLAGS) \
$(TARGET_LIBGCC) $(TARGET_LIBGCC)
endef endef
@ -193,6 +197,7 @@ $(TARGET_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \
$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
$(PRIVATE_LDFLAGS) \ $(PRIVATE_LDFLAGS) \
$(TARGET_GLOBAL_LDFLAGS) \
$(TARGET_LIBGCC) \ $(TARGET_LIBGCC) \
$(TARGET_CRTEND_O) $(TARGET_CRTEND_O)
endef endef
@ -204,6 +209,7 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \
$(TARGET_GLOBAL_LD_DIRS) \ $(TARGET_GLOBAL_LD_DIRS) \
$(TARGET_CRTBEGIN_STATIC_O) \ $(TARGET_CRTBEGIN_STATIC_O) \
$(PRIVATE_LDFLAGS) \ $(PRIVATE_LDFLAGS) \
$(TARGET_GLOBAL_LDFLAGS) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \
$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
$(TARGET_LIBGCC) \ $(TARGET_LIBGCC) \

1
core/combo/select.mk
View File

@ -39,6 +39,7 @@ $(combo_target)HAVE_KERNEL_MODULES := 0
# These flags might (will) be overridden by the target makefiles # These flags might (will) be overridden by the target makefiles
$(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar $(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar
$(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing $(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
$(combo_target)GLOBAL_LDFLAGS :=
$(combo_target)GLOBAL_ARFLAGS := crs $(combo_target)GLOBAL_ARFLAGS := crs
$(combo_target)EXECUTABLE_SUFFIX := $(combo_target)EXECUTABLE_SUFFIX :=