From 8e5e8774171802b15e395877621b2c5d13174890 Mon Sep 17 00:00:00 2001 From: pierre Date: Wed, 5 Jun 2019 12:00:53 +0000 Subject: [PATCH] Fix compilation with release 3.0.4 ppcarm git-svn-id: trunk@42175 - --- rtl/linux/arm/sighnd.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rtl/linux/arm/sighnd.inc b/rtl/linux/arm/sighnd.inc index e80d594eeb..b0a1644365 100644 --- a/rtl/linux/arm/sighnd.inc +++ b/rtl/linux/arm/sighnd.inc @@ -23,7 +23,9 @@ end; {$ifndef CPUTHUMB} Procedure SignalToHandleErrorAddrFrame_ARM(Errno : longint;addr : CodePointer; frame : Pointer); nostackframe; assembler; asm +{$if FPC_VERSION >= 30200} .code 32 +{$endif} // the address is of the faulting instruction, and sigreturn will // skip it -> start with a nop nop @@ -38,6 +40,7 @@ asm end; {$endif not CPUTHUMB} +{$if FPC_VERSION >= 30200} Procedure SignalToHandleErrorAddrFrame_Thumb(Errno : longint;addr : CodePointer; frame : Pointer); nostackframe; assembler; asm .thumb_func @@ -55,6 +58,7 @@ asm pop {r0,r1,r2,pc} .text end; +{$endif} procedure SignalToRunerror(Sig: longint; { _a2,_a3,_a4 : dword; } SigContext: PSigInfo; uContext : PuContext); public name '_FPC_DEFAULTSIGHANDLER'; cdecl; var @@ -93,6 +97,7 @@ begin ucontext^.uc_mcontext.arm_r0:=res; ucontext^.uc_mcontext.arm_r1:=uContext^.uc_mcontext.arm_pc; ucontext^.uc_mcontext.arm_r2:=uContext^.uc_mcontext.arm_fp; +{$if FPC_VERSION >= 30200} {$ifndef CPUTHUMB} if (ucontext^.uc_mcontext.arm_cpsr and (1 shl 5))=0 then begin @@ -103,6 +108,9 @@ begin begin ucontext^.uc_mcontext.arm_pc:=ptruint(@SignalToHandleErrorAddrFrame_Thumb); end; +{$else} + ucontext^.uc_mcontext.arm_pc:=ptruint(@SignalToHandleErrorAddrFrame_ARM); +{$endif} end; end;