From e283510c193caeafd9e47a121661dc8458a6f141 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Fri, 11 Sep 1998 17:38:48 +0000
Subject: [PATCH]    merge for fixes branch

---
 rtl/i386/i386.inc | 12 +++++++++---
 rtl/i386/math.inc | 24 +++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/rtl/i386/i386.inc b/rtl/i386/i386.inc
index 13f9c717cf..4d709caf0a 100644
--- a/rtl/i386/i386.inc
+++ b/rtl/i386/i386.inc
@@ -220,7 +220,7 @@ asm
      { esi contains the vmt }
      pushl %esi
      { call newinstance (class method!) }
-     call 16(%esi)
+     call *16(%esi)
      { newinstance returns a pointer to the new created }
      { instance in eax                                  }
      { load esi and insert self                         }
@@ -245,7 +245,7 @@ asm
      { push self }
      pushl %esi
      { call freeinstance }
-     call 20(%edi)
+     call *20(%edi)
 .LDISPOSE_CLASS1:
      { load self }
      movl 8(%ebp),%esi
@@ -752,7 +752,13 @@ end;
 
 {
   $Log$
-  Revision 1.19  1998-09-01 17:36:17  peter
+  Revision 1.20  1998-09-11 17:38:48  pierre
+     merge for fixes branch
+
+  Revision 1.19.2.1  1998/09/11 17:37:24  pierre
+    * correction respective to stricter as v2.9.1 syntax
+
+  Revision 1.19  1998/09/01 17:36:17  peter
     + internconst
 
   Revision 1.18  1998/08/11 00:04:47  peter
diff --git a/rtl/i386/math.inc b/rtl/i386/math.inc
index f3ccc4f105..f932ce6c58 100644
--- a/rtl/i386/math.inc
+++ b/rtl/i386/math.inc
@@ -106,15 +106,15 @@
             fldl        8(%ebp)
             fldl2e
             fmulp
-            fstcww      .LCW1
-            fstcww      .LCW2
+            fstcw      .LCW1
+            fstcw      .LCW2
             fwait
             andw        $0xf3ff,.LCW2
             orw $0x0400,.LCW2
-            fldcww      .LCW2
+            fldcw      .LCW2
             fldl        %st(0)
             frndint
-            fldcww      .LCW1
+            fldcw      .LCW1
             fxch        %st(1)
             fsub        %st(1),%st
             f2xm1
@@ -347,15 +347,15 @@
             fldt        8(%ebp)
             fldl2e
             fmulp
-            fstcww      .LCW1
-            fstcww      .LCW2
+            fstcw      .LCW1
+            fstcw      .LCW2
             fwait
             andw        $0xf3ff,.LCW2
             orw $0x0400,.LCW2
-            fldcww      .LCW2
+            fldcw      .LCW2
             fld         %st(0)
             frndint
-            fldcww      .LCW1
+            fldcw      .LCW1
             fxch        %st(1)
             fsub        %st(1),%st
             f2xm1
@@ -634,7 +634,13 @@
 
 {
   $Log$
-  Revision 1.8  1998-09-01 17:36:18  peter
+  Revision 1.9  1998-09-11 17:38:49  pierre
+     merge for fixes branch
+
+  Revision 1.8.2.1  1998/09/11 17:37:25  pierre
+    * correction respective to stricter as v2.9.1 syntax
+
+  Revision 1.8  1998/09/01 17:36:18  peter
     + internconst
 
   Revision 1.7  1998/08/25 08:49:05  florian