diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-15 08:07:05 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-15 08:07:05 +0000 |
| commit | b5b42233b31539367d1d1467e1c78a2800ed5d27 (patch) | |
| tree | 2b8e89b191bde58b66f90deed6faa880079cd76d /libobjc | |
| parent | 058672f818da2e2fd3eed44737939291cc02d809 (diff) | |
| download | gcc-b5b42233b31539367d1d1467e1c78a2800ed5d27.tar.gz | |
2016-04-15 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with even more of GCC 6, using subversion 1.9
svn merge -r229701:229740 ^/trunk
}}
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@235007 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 6 | ||||
| -rw-r--r-- | libobjc/encoding.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 8aa2a217844..3405ba71bef 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2015-11-03 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + + PR libobjc/24775 + * encoding.c (objc_layout_finish_structure): Remove usage of + ROUND_TYPE_SIZE. + 2015-09-12 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> PR libobjc/24775 diff --git a/libobjc/encoding.c b/libobjc/encoding.c index abb61454097..7de768f4509 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -1245,14 +1245,8 @@ void objc_layout_finish_structure (struct objc_struct_layout *layout, layout->record_align = MAX (1, layout->record_align); #endif -#ifdef ROUND_TYPE_SIZE - layout->record_size = ROUND_TYPE_SIZE (layout->original_type, - layout->record_size, - layout->record_align); -#else /* Round the size up to be a multiple of the required alignment */ layout->record_size = ROUND (layout->record_size, layout->record_align); -#endif layout->type = NULL; } |