diff options
| -rw-r--r-- | gcc/ada/layout.adb | 13 | ||||
| -rw-r--r-- | gcc/ada/layout.ads | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb index 22ef17d2e55..faff2d5edc0 100644 --- a/gcc/ada/layout.adb +++ b/gcc/ada/layout.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2006, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2007, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -31,6 +31,7 @@ with Einfo; use Einfo; with Errout; use Errout; with Exp_Ch3; use Exp_Ch3; with Exp_Util; use Exp_Util; +with Namet; use Namet; with Nlists; use Nlists; with Nmake; use Nmake; with Opt; use Opt; @@ -70,11 +71,6 @@ package body Layout is -- Local Subprograms -- ----------------------- - procedure Adjust_Esize_Alignment (E : Entity_Id); - -- E is the entity for a type or object. This procedure checks that the - -- size and alignment are compatible, and if not either gives an error - -- message if they cannot be adjusted or else adjusts them appropriately. - function Assoc_Add (Loc : Source_Ptr; Left_Opnd : Node_Id; @@ -2486,9 +2482,8 @@ package body Layout is declare A : constant Uint := Alignment_In_Bits (E); S : constant SO_Ref := RM_Size (E); - begin - Set_Esize (E, (S * A + A - 1) / A); + Set_Esize (E, (S + A - 1) / A * A); end; end if; @@ -2605,7 +2600,7 @@ package body Layout is if Has_Object_Size_Clause (E) then Error_Msg_Uint_1 := RM_Size (E); Error_Msg_F - ("object size is too small, minimum is ^", + ("object size is too small, minimum allowed is ^", Expression (Get_Attribute_Definition_Clause (E, Attribute_Object_Size))); end if; diff --git a/gcc/ada/layout.ads b/gcc/ada/layout.ads index bbdec5261d0..e1cbe94248e 100644 --- a/gcc/ada/layout.ads +++ b/gcc/ada/layout.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2000-2004 Free Software Foundation, Inc. -- +-- Copyright (C) 2000-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -60,6 +60,13 @@ package Layout is -- it means that the object must be allocated dynamically, since -- its length is not known at compile time. + -- The following are utility routines, called from various places + + procedure Adjust_Esize_Alignment (E : Entity_Id); + -- E is the entity for a type or object. This procedure checks that the + -- size and alignment are compatible, and if not either gives an error + -- message if they cannot be adjusted or else adjusts them appropriately. + procedure Set_Discrete_RM_Size (Def_Id : Entity_Id); -- Set proper RM_Size for discrete size, this is normally the minimum -- number of bits to accommodate the range given, except in the case |
