diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c
index f70f72c85a..adcbe13d1e 100644
--- a/libretro-common/features/features_cpu.c
+++ b/libretro-common/features/features_cpu.c
@@ -322,9 +322,9 @@ static uint64_t xgetbv_x86(uint32_t idx)
 #endif
 
 #if defined(__ARM_NEON__)
+#if defined(__arm__)
 static void arm_enable_runfast_mode(void)
 {
-#if defined(__arm__)
    /* RunFast mode. Enables flush-to-zero and some
     * floating point optimizations. */
    static const unsigned x = 0x04086060;
@@ -338,9 +338,9 @@ static void arm_enable_runfast_mode(void)
          : "=r"(r)
          : "r"(x), "r"(y)
         );
-#endif
 }
 #endif
+#endif
 
 #if defined(__linux__) && !defined(CPU_X86)
 static unsigned char check_arm_cpu_feature(const char* feature)
@@ -751,7 +751,7 @@ uint64_t cpu_features_get(void)
    if (check_arm_cpu_feature("neon"))
    {
       cpu |= RETRO_SIMD_NEON;
-#ifdef __ARM_NEON__
+#if defined(__ARM_NEON__) && defined(__arm__)
       arm_enable_runfast_mode();
 #endif
    }
@@ -767,7 +767,9 @@ uint64_t cpu_features_get(void)
       cpu |= RETRO_SIMD_ASIMD;
 #ifdef __ARM_NEON__
       cpu |= RETRO_SIMD_NEON;
+#if defined(__arm__)
       arm_enable_runfast_mode();
+#endif
 #endif
    }
 
@@ -786,7 +788,9 @@ uint64_t cpu_features_get(void)
 
 #elif defined(__ARM_NEON__)
    cpu |= RETRO_SIMD_NEON;
+#if defined(__arm__)
    arm_enable_runfast_mode();
+#endif
 #elif defined(__ALTIVEC__)
    cpu |= RETRO_SIMD_VMX;
 #elif defined(XBOX360)
diff --git a/retroarch.c b/retroarch.c
index 77e866c96d..89d84e93ef 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -25071,7 +25071,6 @@ bool input_key_pressed(int key, bool keyboard_pressed)
         )
       )
    {
-      rarch_joypad_info_t joypad_info;
       struct rarch_state *p_rarch    = &rarch_st;
       const input_device_driver_t
          *joypad                     = (const input_device_driver_t*)