diff options
author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-02-14 23:47:42 +0000 |
---|---|---|
committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-02-14 23:47:42 +0000 |
commit | d2a1558df1aef72e617a4830dee0498eaebc36e1 (patch) | |
tree | 195f138557908f260e127a9e360f00f59cfb781f /rtl/linux | |
parent | 015caf9963d7993a235d9d733eac92a85780d57b (diff) | |
parent | 7b1394c2343f46572e9f4ca379f21db766dac9a6 (diff) | |
download | fpc-d2a1558df1aef72e617a4830dee0498eaebc36e1.tar.gz |
* synchronized with trunk
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/wasm@48680 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl/linux')
-rw-r--r-- | rtl/linux/arm/sighnd.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rtl/linux/arm/sighnd.inc b/rtl/linux/arm/sighnd.inc index 5a5fd3fd15..08fc516dc6 100644 --- a/rtl/linux/arm/sighnd.inc +++ b/rtl/linux/arm/sighnd.inc @@ -20,7 +20,7 @@ begin result:=@HandleErrorAddrFrame; end; -{$ifndef CPUTHUMB} +{$if not(defined(CPUTHUMB)) and not(defined(CPUTHUMB2))} Procedure SignalToHandleErrorAddrFrame_ARM(Errno : longint;addr : CodePointer; frame : Pointer); nostackframe; assembler; asm {$if FPC_FULLVERSION >= 30200} @@ -38,7 +38,7 @@ asm pop {r0,r1,r2,pc} .text end; -{$endif not CPUTHUMB} +{$endif not(defined(CPUTHUMB)) and not(defined(CPUTHUMB2))} {$if FPC_FULLVERSION >= 30200} Procedure SignalToHandleErrorAddrFrame_Thumb(Errno : longint;addr : CodePointer; frame : Pointer); nostackframe; assembler; @@ -57,9 +57,9 @@ asm mov lr, r0 pop {r0,r1,r2,pc} .text -{$ifndef CPUTHUMB} +{$if not(defined(CPUTHUMB)) and not(defined(CPUTHUMB2))} .code 32 -{$endif CPUTHUMB} +{$endif not(defined(CPUTHUMB)) and not(defined(CPUTHUMB2))} end; {$endif} @@ -102,13 +102,13 @@ begin ucontext^.uc_mcontext.arm_r1:=uContext^.uc_mcontext.arm_pc; ucontext^.uc_mcontext.arm_r2:=uContext^.uc_mcontext.arm_fp; {$if FPC_FULLVERSION >= 30200} -{$ifndef CPUTHUMB} +{$if not(defined(CPUTHUMB)) and not(defined(CPUTHUMB2))} if (ucontext^.uc_mcontext.arm_cpsr and (1 shl 5))=0 then begin ucontext^.uc_mcontext.arm_pc:=ptruint(@SignalToHandleErrorAddrFrame_ARM); end else -{$endif not CPUTHUMB} +{$endif not(defined(CPUTHUMB)) and not(defined(CPUTHUMB2))} begin ucontext^.uc_mcontext.arm_pc:=ptruint(@SignalToHandleErrorAddrFrame_Thumb); end; |