From: Pascal Packaging Team <pkg-pascal-devel@lists.alioth.debian.org>
Date: Thu, 5 Jul 2018 13:29:50 +0000 (+0100)
Subject: fpc-r38400
X-Git-Tag: archive/raspbian/3.0.4+dfsg-21+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e03c03688459211c3f0d591abdc1d3c5f74a2e9;p=fpc.git

fpc-r38400


Gbp-Pq: Name fpc-r38400.patch
---

diff --git a/fpcsrc/rtl/linux/x86_64/cprt0.as b/fpcsrc/rtl/linux/x86_64/cprt0.as
index 11d091ef..9f314343 100644
--- a/fpcsrc/rtl/linux/x86_64/cprt0.as
+++ b/fpcsrc/rtl/linux/x86_64/cprt0.as
@@ -111,6 +111,7 @@ _haltproc:
 	movq    ___fpc_ret_rbp@GOTPCREL(%rip),%rcx
         movq    (%rcx),%rbp
 	movq    ___fpc_ret@GOTPCREL(%rip),%rcx
+        popq    %rdx
         movq    (%rcx),%rdx
         pushq    %rdx
 	ret
diff --git a/fpcsrc/rtl/linux/x86_64/si_c.inc b/fpcsrc/rtl/linux/x86_64/si_c.inc
index 5bf0f835..e8addff8 100644
--- a/fpcsrc/rtl/linux/x86_64/si_c.inc
+++ b/fpcsrc/rtl/linux/x86_64/si_c.inc
@@ -158,6 +158,7 @@ procedure _FPC_libc_haltproc; assembler; nostackframe; public name '_haltproc';
     movq      ExitCode@GOTPCREL(%rip),%rax
     movzwq    (%rax),%rax { load and save exitcode }
 
+    popq    %rdx                    { keep stack aligned }
     movq fpc_ret(%rip),%rdx         { return to libc }
     movq fpc_ret_rbp(%rip),%rbp
     pushq %rdx