From 09a2fabb4311fa0dba9993aa5a5c5bb334804fd4 Mon Sep 17 00:00:00 2001 From: pierre Date: Mon, 3 Feb 2020 23:16:03 +0000 Subject: [PATCH] Merge of commit 43029 ------------------------------------------------------------------------ r43029 | pierre | 2019-09-18 07:45:47 +0000 (Wed, 18 Sep 2019) | 1 line Fix bug report #36081: fix cycling starting with i386-linux 3.0.4 release compiler ------------------------------------------------------------------------ --- Merging r43029 into '.': U rtl/inc/system.inc --- Recording mergeinfo for merge of r43029 into '.': U . git-svn-id: branches/fixes_3_2@44109 - --- rtl/inc/system.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc index 7ac57b95cb..c1cf901459 100644 --- a/rtl/inc/system.inc +++ b/rtl/inc/system.inc @@ -890,6 +890,7 @@ begin exit; { check stack alignment } {$ifdef CPUI386} +{$ifdef FPC_STACKALIGNMENT} {$if FPC_STACKALIGNMENT=16} if ((PtrUInt(Sptr)+4) mod 16)<>0 then begin @@ -897,6 +898,7 @@ begin HandleError(202); end; {$endif FPC_STACKALIGNMENT=16} +{$endif FPC_STACKALIGNMENT} {$endif CPUI386} { don't use stack_size, since the stack pointer has already been decreased when this routine is called