arm: add support for processors with hardware division

ARMv7-M has hardware division, so it doesn't require __div0
or any support functions for 32-bit division.

Change-Id: I840683a1a77d737f378899ca4bcf858216b81014

lib/arm_support/support-arm.S

@@ -219,7 +219,7 @@
 .endif
 .endm
 
-#else
+#else /* ARM_ARCH >= 5 */
 .macro ARMV5_UDIV32_BODY numerator, divisor, quotient, remainder, bits, inv, neg, div0label, return
     cmp     \numerator, \divisor
     clz     \bits, \divisor
@@ -398,7 +398,7 @@
 .else
     b       99f
 .endif
-#endif
+#endif /* ARM_ARCH >= 6 */
 99:
 .endm
 
@@ -594,7 +594,7 @@
 .endif
 99:
 .endm
-#endif
+#endif /* ARM_ARCH */
 
     .section .text
 
@@ -671,7 +671,7 @@ __aeabi_idivmod:
     .size __aeabi_idivmod, . - __aeabi_idivmod
 #endif
 
-#else
+#elif !defined(ARM_HAVE_HW_DIV) /* && ARM_ARCH >= 5 */
 #ifndef __ARM_EABI__
 __udivsi3:
     ARMV5_UDIV32_BODY r0, r1, r0, "", r2, r3, ip, __div0_wrap, 1
@@ -717,6 +717,7 @@ __aeabi_idivmod:
     .global     __popcountdi2
     .type       __popcountdi2, %function
     .set        __popcountdi2, __popcountsi2
+    .align      2
 
 __popcountsi2:
     ldr     r2, .L2            @ r2 = 0x55555555

lib/rbcodec/codecs/codec_crt0.c

@@ -66,7 +66,7 @@ enum codec_status codec_start(enum codec_entry_call_reason reason)
     return codec_main(reason);
 }
 
-#if defined(CPU_ARM) && (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if defined(ARM_NEED_DIV0)
 void __attribute__((naked)) __div0(void)
 {
     asm volatile("bx %0" : : "r"(ci->__div0));

lib/rbcodec/codecs/codecs.h

@@ -154,7 +154,7 @@ struct codec_api {
     bool (*loop_track)(void);
 
     /* kernel/ system */
-#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
+#if defined(ARM_NEED_DIV0)
     void (*__div0)(void);
 #endif
     unsigned (*sleep)(unsigned ticks);

lib/rbcodec/codecs/demac/libdemac/SOURCES

@@ -1,8 +1,10 @@
 predictor.c
-#ifdef CPU_ARM
+#if defined(CPU_ARM)
 predictor-arm.S
+#if !defined(ARM_HAVE_HW_DIV)
 udiv32_arm.S
-#elif defined CPU_COLDFIRE
+#endif
+#elif defined(CPU_COLDFIRE)
 predictor-cf.S
 #endif
 entropy.c

lib/rbcodec/codecs/demac/libdemac/demac_config.h

@@ -125,7 +125,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
 
 #ifndef __ASSEMBLER__
 
-#if defined(CPU_ARM) && (ARM_ARCH < 5 || defined(USE_IRAM))
+#if defined(CPU_ARM) && (ARM_ARCH < 5 || defined(USE_IRAM)) && !defined(ARM_HAVE_HW_DIV)
 /* optimised unsigned integer division for ARMv4, in IRAM */
 unsigned udiv32_arm(unsigned a, unsigned b);
 #define UDIV32(a, b) udiv32_arm(a, b)