Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / native_client / src / trusted / service_runtime / arch / arm / sel_ldr_arm.c

diff --git a/src/native_client/src/trusted/service_runtime/arch/arm/sel_ldr_arm.c b/src/native_client/src/trusted/service_runtime/arch/arm/sel_ldr_arm.c
index a6b04b1..f3e33f9 100644 (file)
--- a/src/native_client/src/trusted/service_runtime/arch/arm/sel_ldr_arm.c
+++ b/src/native_client/src/trusted/service_runtime/arch/arm/sel_ldr_arm.c
@@ -55,11 +55,7 @@ void  NaClPatchOneTrampoline(struct NaClApp *nap,
 
 
 void NaClFillMemoryRegionWithHalt(void *start, size_t size) {
-#if defined(NACL_TARGET_ARM_THUMB2_MODE)
-  uint16_t *inst = (uint16_t *) start;
-#else
   uint32_t *inst = (uint32_t *) start;
-#endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */
   uint32_t i;
 
   CHECK(sizeof *inst == NACL_HALT_LEN);