Merge commit '3102d523c787402faf4590c7e25cef8c3e20afa4' into merge_korg_master

Conflicts:
	vm/Android.mk

Author: Jean-Baptiste Queru

README.txt

@@ -50,3 +50,11 @@ Here is the combined header comment:
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
+Native SH call bridge
+---------------------
+
+Native SH call bridge is written by
+Shin-ichiro KAWASAKI <[email protected]>
+and Contributed to Android by Hitachi, Ltd. and Renesas Solutions Corp.

vm/Android.mk

@@ -283,6 +283,15 @@ ifeq ($(TARGET_ARCH),x86)
 		mterp/out/InterpAsm-x86.S
 endif
 
+ifeq ($(TARGET_ARCH),sh)
+  MTERP_ARCH_KNOWN := true
+  LOCAL_SRC_FILES += \
+		arch/sh/CallSH4ABI.S \
+		arch/generic/Hints.c \
+		mterp/out/InterpC-allstubs.c \
+		mterp/out/InterpAsm-allstubs.S
+endif
+
 ifeq ($(MTERP_ARCH_KNOWN),false)
   # unknown architecture, try to use FFI
   LOCAL_C_INCLUDES += external/libffi/$(TARGET_OS)-$(TARGET_ARCH)