Added support for TARGET_ARCH_VERSION=armv5te-vfp.
This is currently a copy & paste of the armv5te parameters. I don't
know if there's a better way to encode this, or to what extent we will
need to specialize it vs. armv5te in a future build (e.g. to enable fp
instruction use in code gen).
Currently the only effect is to select the VFP-enabled mterp sources in
Dalvik.
diff --git a/core/combo/linux-arm.mk b/core/combo/linux-arm.mk
index f15d29a..b07d243 100644
--- a/core/combo/linux-arm.mk
+++ b/core/combo/linux-arm.mk
@@ -42,6 +42,17 @@
arch_version_cflags := -march=armv5te -mtune=xscale -D__ARM_ARCH_5__ \
-D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__
else
+ifeq ($(TARGET_ARCH_VERSION),armv5te-vfp)
+ARCH_ARM_HAVE_THUMB_SUPPORT := true
+ARCH_ARM_HAVE_FAST_INTERWORKING := true
+ARCH_ARM_HAVE_64BIT_DATA := true
+ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true
+ARCH_ARM_HAVE_CLZ := true
+ARCH_ARM_HAVE_FFS := true
+
+arch_version_cflags := -march=armv5te -mtune=xscale -D__ARM_ARCH_5__ \
+ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__
+else
ifeq ($(TARGET_ARCH_VERSION),armv4t)
$(warning ARMv4t support is currently a work in progress. It does not work right now!)
ARCH_ARM_HAVE_THUMB_SUPPORT := false
@@ -58,6 +69,7 @@
$(error Unknown ARM architecture version: $(TARGET_ARCH_VERSION))
endif
endif
+endif
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
ifeq ($(strip $($(combo_target)TOOLS_PREFIX)),)
