X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libobjc%2Farchive.c;h=b3af32d248a90d154874044b21860013212025a2;hb=8c68a50a8dd6498f937a72b76e99218650e9cb0d;hp=3bfd975a18a124fe908d93bbb52a47041d02f6b3;hpb=2386cda71430cc4506dfad035001091d450afde4;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libobjc/archive.c b/libobjc/archive.c
index 3bfd975a18a..b3af32d248a 100644
--- a/libobjc/archive.c
+++ b/libobjc/archive.c
@@ -15,8 +15,8 @@ details.
 
 You should have received a copy of the GNU General Public License along with
 GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
@@ -908,7 +908,7 @@ objc_read_class (struct objc_typed_stream *stream, Class *class)
 
 	  objc_read_unsigned_long (stream, &version);
 	  objc_hash_add (&stream->class_table,
-			 (*class)->name, (void *)version);
+			 (*class)->name, (void *) ((size_t) version));
 	}
 
       else if ((buf[0]&_B_CODE) == _B_UCOMM)
@@ -1069,7 +1069,7 @@ objc_write_type (TypedStream *stream, const char *type, const void *data)
       while (*type != _C_STRUCT_E)
 	{
 	  align = objc_alignof_type (type);       /* padd to alignment */
-	  acc_size += ROUND (acc_size, align);
+	  acc_size = ROUND (acc_size, align);
 	  objc_write_type (stream, type, ((char *) data) + acc_size);
 	  acc_size += objc_sizeof_type (type);   /* add component size */
 	  type = objc_skip_typespec (type);	 /* skip component */
@@ -1165,7 +1165,7 @@ objc_read_type(TypedStream *stream, const char *type, void *data)
       while (*type != _C_STRUCT_E)
 	{
 	  align = objc_alignof_type (type);       /* padd to alignment */
-	  acc_size += ROUND (acc_size, align);
+	  acc_size = ROUND (acc_size, align);
 	  objc_read_type (stream, type, ((char*)data)+acc_size);
 	  acc_size += objc_sizeof_type (type);   /* add component size */
 	  type = objc_skip_typespec (type);	 /* skip component */