From 6be389e9549b9ccbd198ad0e7f24e041a7f1c90b Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Thu, 21 Sep 2006 20:34:18 +0000
Subject: [PATCH]   * fixed bug in r4674

git-svn-id: trunk@4678 -
---
 compiler/ncgmem.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/ncgmem.pas b/compiler/ncgmem.pas
index d7f5377506..92779b3dd9 100644
--- a/compiler/ncgmem.pas
+++ b/compiler/ncgmem.pas
@@ -369,7 +369,6 @@ implementation
                  inc(location.reference.offset,vs.fieldoffset);
 {$ifdef SUPPORT_UNALIGNED}
                  { packed? }
-                 {$warning unalignment check does not work since usefieldalignment is not stored in ppu}
                  if (vs.owner.defowner.deftype in [recorddef,objectdef]) and
                    (tabstractrecordsymtable(vs.owner).usefieldalignment=1) then
                    location.reference.alignment:=1;
@@ -772,7 +771,9 @@ implementation
                 begin
                   inc(location.reference.offset,
                     bytemulsize*tordconstnode(right).value);
-                  newsize:=int_cgsize(bytemulsize);
+                  { don't do this for floats etc. }
+                  if (tcgsize2size[newsize] <> bytemulsize) then
+                    newsize:=int_cgsize(bytemulsize);
                 end
               else
                 begin