[Builtin][ARM] Try to address error on FreeBSD with r288777

[weimingz]

Summary

It seems the only suspicious change in r288777 is the extra "#ifdef ARM_ARCH_EXT_IDIV".
The rest of the change in r288777 should not affect the "#else" part of "__ARM_ARCH_ISA_THUMB == 1"

lib/builtins/arm/udivsi3.S

#    else
   JMP(ip)
 #    endif
 #  endif /* __ARM_FEATURE_CLZ */
 
 
 #define IMM #
   /* due to the range limit of branch in Thumb1, we have to place the
      block closer */
+#if __ARM_ARCH_ISA_THUMB == 1
 LOCAL_LABEL(divby0):
   movs  r0, #0
 #      if defined(__ARM_EABI__)
   bl  __aeabi_idiv0 // due to relocation limit, can't use b.
 #      endif
   JMP(lr)
 
-
-#if __ARM_ARCH_ISA_THUMB == 1
 #define block(shift)                                                           \
   lsls r2, r1, IMM shift;                                                      \
   cmp r0, r2;                                                                  \
   blo LOCAL_LABEL(block_skip_##shift);                                         \
   subs r0, r0, r2;                                                             \
   LOCAL_LABEL(block_skip_##shift) :;                                           \
   adcs r3, r3 /* same as ((r3 << 1) | Carry). Carry is set if r0 >= r2. */
 
#endif
   block(1)
 LOCAL_LABEL(div0block):
   block(0)
 
   mov r0, r3
   JMP(lr)
 #endif /* __ARM_ARCH_EXT_IDIV__ */
 
-#if __ARM_ARCH_EXT_IDIV__
+#if __ARM_ARCH_ISA_THUMB != 1
 LOCAL_LABEL(divby0):
-        mov     r0, #0
+  mov     r0, #0
 #  ifdef __ARM_EABI__
-        b       __aeabi_idiv0
+  b       __aeabi_idiv0
 #  else
-        JMP(lr)
+  JMP(lr)
 #  endif
 #endif
 
 END_COMPILERRT_FUNCTION(__udivsi3)
 
 NO_EXEC_STACK_DIRECTIVE