From 27538f21a4abc08373892a11285dfe52ea447131 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 17 Sep 2011 11:21:00 +0000 Subject: [PATCH] merge r13489 from cpstrnew branch by florian: * made tcpstr1 work git-svn-id: trunk@19086 - --- compiler/ncginl.pas | 1 - rtl/i386/i386.inc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/ncginl.pas b/compiler/ncginl.pas index 16c70514ff..d2b8d84a8f 100644 --- a/compiler/ncginl.pas +++ b/compiler/ncginl.pas @@ -328,7 +328,6 @@ implementation end; - {***************************************************************************** LENGTH GENERIC HANDLING *****************************************************************************} diff --git a/rtl/i386/i386.inc b/rtl/i386/i386.inc index 5b74c6c7aa..3950150ba0 100644 --- a/rtl/i386/i386.inc +++ b/rtl/i386/i386.inc @@ -1643,7 +1643,7 @@ asm .Lj3620: movl (%esp),%eax movl (%eax),%eax - subl $8,%eax + subl $12,%eax call FPC_FREEMEM_X movl (%esp),%eax movl $0,(%eax)