From c6b4b58325509f0caa7950059675457263bf6957 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 18 Sep 2017 22:25:49 +0000 Subject: Merge from trunk revision 252949. From-SVN: r252952 --- libobjc/ChangeLog | 7 +++++++ libobjc/encoding.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'libobjc') diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index f73c547..b36962c 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,10 @@ +2017-08-30 Richard Sandiford + Alan Hayward + David Sherwood + + * encoding.c (_darwin_rs6000_special_round_type_align): Prefix mode + names with E_ in case statements. + 2017-02-07 Richard Biener PR tree-optimization/79256 diff --git a/libobjc/encoding.c b/libobjc/encoding.c index 6f18d60..776b82d 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -162,7 +162,7 @@ _darwin_rs6000_special_round_type_align (const char *struc, int comp, int spec) case UNION_TYPE: return MAX (MAX (comp, spec), objc_alignof_type (_stp) * __CHAR_BIT__); break; - case DFmode: + case E_DFmode: case _C_LNG_LNG: case _C_ULNG_LNG: return MAX (MAX (comp, spec), 64); -- cgit v1.1