Dalvik: Better compatibility with different compilerslinaro_android_4.4.2linaro_android_4.4

This fixes building with clang, and possibly future versions of gcc:
- Don't error out on unused functions generated by gen-mterp.py
  even when we're using -Werror
- Eliminate some dead code (Word/kWordSize definition) clang warns about
- Add a return statement to a switch path causing a possible code path
  with uninitialized variables (if the compiler doesn't know what
  dvmAbort() is)
- Initialize a variable

Change-Id: I9a3c0a1ad4dce10445e2251e491f18511413ca50
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

2 files changed, 2 insertions, 3 deletions

diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 2af05823b..d34a05466 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -238,6 +238,8 @@ ifeq ($(dvm_arch),arm)
   #dvm_arch_variant := armv7-a
   #LOCAL_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfp
   LOCAL_CFLAGS += -Werror
+  # Don't error out on unused functions generated by gen-mterp.py
+  LOCAL_CFLAGS += -Wno-error=unused-function
   MTERP_ARCH_KNOWN := true
   # Select architecture-specific sources (armv5te, armv7-a, etc.)
   LOCAL_SRC_FILES += \
diff --git a/vm/alloc/MarkSweep.cpp b/vm/alloc/MarkSweep.cpp
index 2781a7cfa..008b40423 100644
--- a/vm/alloc/MarkSweep.cpp
+++ b/vm/alloc/MarkSweep.cpp
@@ -26,9 +26,6 @@
 #include <sys/mman.h>   // for madvise(), mmap()
 #include <errno.h>
 
-typedef unsigned long Word;
-const size_t kWordSize = sizeof(Word);
-
 /*
  * Returns true if the given object is marked.
  */