Merged revision(s) 32072, 32078 from trunk:

* arm-android: Use kuser_cmpxchg for Interlocked* functions when RTL is compiled for the ARMv5t CPU.
........
* arm-android: Compile for ARMv5T by default to be compatible with all versions of Android.
........

git-svn-id: branches/fixes_3_0@32080 -

compiler/options.pas

@@ -3699,11 +3699,11 @@ begin
       end;
     system_arm_android:
       begin
-        { set default cpu type to ARMv6 for Android unless specified otherwise }
+        { set default cpu type to ARMv5T for Android unless specified otherwise }
         if not option.CPUSetExplicitly then
-          init_settings.cputype:=cpu_armv6;
+          init_settings.cputype:=cpu_armv5t;
         if not option.OptCPUSetExplicitly then
-          init_settings.optimizecputype:=cpu_armv6;
+          init_settings.optimizecputype:=cpu_armv5t;
       end;
   end;
 

rtl/arm/armdefines.inc

@@ -14,6 +14,8 @@
 
  **********************************************************************}
 
-{$if defined(LINUX) and (defined(CPUARMEL) or defined(CPUARMHF))}
-{$define SYSTEM_HAS_KUSER_CMPXCHG} // system has kuser_cmpxchg method
+{$if defined(LINUX) or defined(ANDROID)}
+  {$if defined(CPUARMEL) or defined(CPUARMHF)}
+    {$define SYSTEM_HAS_KUSER_CMPXCHG} // system has kuser_cmpxchg method
+  {$endif}
 {$endif}