diff options
Diffstat (limited to 'vm/Dvm.mk')
| -rw-r--r-- | vm/Dvm.mk | 24 |
1 files changed, 19 insertions, 5 deletions
@@ -26,8 +26,9 @@ # LOCAL_CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2 -LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter +LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-variable LOCAL_CFLAGS += -DARCH_VARIANT=\"$(dvm_arch_variant)\" +LOCAL_CFLAGS += -D__STDC_LIMIT_MACROS ifneq ($(strip $(LOCAL_CLANG)),true) LOCAL_CFLAGS += -fno-align-jumps @@ -284,6 +285,10 @@ ifeq ($(dvm_arch),mips) compiler/codegen/mips/GlobalOptimizations.cpp \ compiler/template/out/CompilerTemplateAsm-$(dvm_arch_variant).S endif + + ifeq ($(strip $(ARCH_HAVE_ALIGNED_DOUBLES)),true) + LOCAL_CFLAGS += -DARCH_HAVE_ALIGNED_DOUBLES + endif endif ifeq ($(dvm_arch),x86) @@ -292,10 +297,10 @@ ifeq ($(dvm_arch),x86) LOCAL_CFLAGS += -DDVM_JMP_TABLE_MTERP=1 \ -DMTERP_STUB LOCAL_SRC_FILES += \ - arch/$(dvm_arch_variant)/Call386ABI.S \ - arch/$(dvm_arch_variant)/Hints386ABI.cpp \ - mterp/out/InterpC-$(dvm_arch_variant).cpp \ - mterp/out/InterpAsm-$(dvm_arch_variant).S + arch/$(dvm_arch)/Call386ABI.S \ + arch/$(dvm_arch)/Hints386ABI.cpp \ + mterp/out/InterpC-$(dvm_arch).cpp \ + mterp/out/InterpAsm-$(dvm_arch).S ifeq ($(WITH_JIT),true) LOCAL_CFLAGS += -DARCH_IA32 LOCAL_SRC_FILES += \ @@ -351,3 +356,12 @@ ifeq ($(MTERP_ARCH_KNOWN),false) LOCAL_CFLAGS += -DdvmAsmInstructionStart=0 -DdvmAsmInstructionEnd=0 \ -DdvmAsmSisterStart=0 -DdvmAsmSisterEnd=0 -DDVM_NO_ASM_INTERP=1 endif + +# Needed because getLongFromArray etc. are defined in +# vm/mterp/c/header.cpp, but only used if some asm +# implementations aren't available. +# To fix this without generating unused functions, +# gen-mterp.py would need to be a lot more intelligent +# (picking just the parts of header.cpp that are +# actually used in C code). Doesn't seem to be worth it. +LOCAL_CFLAGS += -Wno-error=unused-function |