Fix ARM preprocessor macros in assembly.h
assembly.h defines some preprocessor macros for ARM assembly. However,
it would only do so if __ARM_FEATURE_CLZ was not already defined.
This change makes the ARM NaCl macro definitions independent of
__ARM_FEATURE_CLZ.
Bug: 1106311
Change-Id: I0df301ccdc55fd757c217fe1c73fd36e5d74c629
diff --git a/lib/builtins/assembly.h b/lib/builtins/assembly.h
index 0102e73..e4ca16c 100644
--- a/lib/builtins/assembly.h
+++ b/lib/builtins/assembly.h
@@ -63,8 +63,10 @@
#if !defined(__ARM_FEATURE_CLZ) && \
(__ARM_ARCH >= 6 || (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__)))
#define __ARM_FEATURE_CLZ
+#endif
/* LOCALMOD-START */
+#if !defined(SFI_SP)
#if defined(__native_client__) && !defined(__native_client_nonsfi__)
#define SFI_SP sfi_sp
#define SFI_BREG sfi_breg reg
@@ -79,8 +81,8 @@
#define SFI_BX bx
#define NACL_ALIGN
#endif
-/* LOCALMOD-END */
#endif
+/* LOCALMOD-END */
#ifdef ARM_HAS_BX
#define JMP(r) bx r
