浏览代码

Fix arm-android compilation by prepending syscall_nr_ prefix also to __ARM_NR_XXX arm specific linux syscalls

git-svn-id: trunk@40300 -
pierre 6 年之前
父节点
当前提交
04debba9de
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 5 5
      rtl/linux/arm/sysnr.inc
  2. 1 1
      rtl/linux/system.pp

+ 5 - 5
rtl/linux/arm/sysnr.inc

@@ -415,8 +415,8 @@ Const
  * The following SWIs are ARM private.
  *}
   __ARM_NR_BASE                         = syscall_nr_base+$f0000;
-  __ARM_NR_breakpoint                   = __ARM_NR_BASE+1;
-  __ARM_NR_cacheflush                   = __ARM_NR_BASE+2;
-  __ARM_NR_usr26                        = __ARM_NR_BASE+3;
-  __ARM_NR_usr32                        = __ARM_NR_BASE+4;
-  __ARM_NR_set_tls                      = __ARM_NR_BASE+5;
+  syscall_nr___ARM_NR_breakpoint        = __ARM_NR_BASE+1;
+  syscall_nr___ARM_NR_cacheflush        = __ARM_NR_BASE+2;
+  syscall_nr___ARM_NR_usr26             = __ARM_NR_BASE+3;
+  syscall_nr___ARM_NR_usr32             = __ARM_NR_BASE+4;
+  syscall_nr___ARM_NR_set_tls           = __ARM_NR_BASE+5;

+ 1 - 1
rtl/linux/system.pp

@@ -446,7 +446,7 @@ end;
 {$define INITTLS}
 Function fpset_tls(p : pointer;size : SizeUInt):cint;
 begin
-  Result:=do_syscall(__ARM_NR_set_tls,TSysParam(p));
+  Result:=do_syscall(syscall_nr___ARM_NR_set_tls,TSysParam(p));
 end;
 {$endif defined(CPUARM)}