* c-typeck.c (c_common_type): Prefer double_type_node over
        other REAL_TYPE types with the same precision.
        (convert_arguments): Likewise.

Conflicts:
	gcc/c/ChangeLog.AVR
        * c-common.c (same_scalar_type_ignoring_signedness): Also
        accept short/int as equivalent if they have the same type.

Conflicts:
	gcc/c-family/ChangeLog.AVR