diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2014-06-28 10:23:53 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@gcc.gnu.org> | 2014-06-28 10:23:53 +0000 |
| commit | a86471635f38376128e6cea8d6856f025a57b4c2 (patch) | |
| tree | 807c3b12d39e140887e5ddffbf05478fb1fd6581 /gcc | |
| parent | fb682f9458c6cf421e11380f5d8b97393feb0bc0 (diff) | |
| download | gcc-a86471635f38376128e6cea8d6856f025a57b4c2.zip gcc-a86471635f38376128e6cea8d6856f025a57b4c2.tar.gz gcc-a86471635f38376128e6cea8d6856f025a57b4c2.tar.bz2 | |
rs6000.c (rs6000_aggregate_candidate): Revert accidental change due to wide-int branch merge.
2014-06-28 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
* config/rs6000/rs6000.c (rs6000_aggregate_candidate): Revert
accidental change due to wide-int branch merge.
From-SVN: r212100
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9216478..148477d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-06-28 Ulrich Weigand <Ulrich.Weigand@de.ibm.com> + + * config/rs6000/rs6000.c (rs6000_aggregate_candidate): Revert + accidental change due to wide-int branch merge. + 2014-06-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac (gcc_cv_as_compress_debug): Check for assembler diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index fc7d766..67690d9 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -8766,6 +8766,7 @@ rs6000_aggregate_candidate (const_tree type, enum machine_mode *modep) fixed. */ if (!COMPLETE_TYPE_P (type) || TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST) + return -1; for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field)) { |