Restored the previous architecture check for whether to use arm assembly in FreeType.

Source/ThirdParty/FreeType/include/freetype/config/ftconfig.h

@@ -15,6 +15,7 @@
 /*                                                                         */
 /***************************************************************************/
 
+// Modified by Lasse Oorni for Urho3D
 
   /*************************************************************************/
   /*                                                                       */
@@ -368,10 +369,9 @@ FT_BEGIN_HEADER
 
 #ifdef __GNUC__
 
-#if defined( __arm__ )                                 && \
-    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
+// Urho3D: restored previous architecture check to prevent iOS build failure
+#if defined( __arm__ ) && !defined( __thumb__ )    && \
     !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
-
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
 
   /* documentation is in freetype.h */
@@ -397,9 +397,7 @@ FT_BEGIN_HEADER
     return a;
   }
 
-#endif /* __arm__                      && */
-       /* ( __thumb2__ || !__thumb__ ) && */
-       /* !( __CC_ARM || __ARMCC__ )      */
+#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
 
 
 #if defined( __i386__ )