From e426b47b65aca8b12aff9697e769c98c03af7691 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Mon, 18 Oct 2010 18:06:03 +0000 Subject: In gcc/: 2010-10-18 Nicola Pero In gcc/: 2010-10-18 Nicola Pero Merge from 'apple/trunk' branch on FSF servers. * c-parser.c (c_parser_typeof_specifier): Adapted to new parser the following Objective-C change: 2005-10-07 Fariborz Jahanian Radar 4204796 * c-parse.in (typespec_nonreserved_nonattr): Remove volatile from 'volatilized' type used in a typeof operator. In gcc/c-family/: 2010-10-18 Nicola Pero Merge from 'apple/trunk' branch on FSF servers. 2005-11-08 Fariborz Jahanian Radar 4330422 * c-common.h (objc_non_volatilized_type): New declaration * stub-objc.c (objc_non_volatilized_type): New stub. In gcc/cp/: 2010-10-18 Nicola Pero Merge from apple/trunk branch on FSF servers. 2005-03-01 Fariborz Jahanian Radar 4451818 * call.c (standard_conversion, implicit_conversion): Ignore 'volatile' attribute of artificially volatized type in objc when evaluating various conversion weights. 2005-11-08 Fariborz Jahanian Radar 4330422 * typeck.c (comp_ptr_ttypes_real): Remove the hack. un-volatize the artiificially 'volatized' type before doing pointer comparison. In gcc/objc/: 2010-10-17 Nicola Pero Merge from 'apple/trunk' branch on FSF servers. 2005-11-08 Fariborz Jahanian Radar 4330422 * objc/objc-act.c (objc_non_volatilized_type): New 2005-10-07 Fariborz Jahanian Radar 4204796 * objc-act.c (objc_build_volatilized_type): Build 'volatilzed' types with proper attribute set and correctly. (objc_volatilize_decl): Remove unneeded code. (objc_type_quals_match): Use the new attribute to check on 'volatilzed' type. (hash_init): removed unneeded code. In gcc/testsuite/: 2010-10-18 Nicola Pero Merge from 'apple/trunk' branch on FSF servers. 2005-03-01 Fariborz Jahanian Radar 4451818 * obj-c++.dg/try-catch-16.mm: New. * obj-c++.dg/try-catch-17.mm: New. 2005-11-08 Fariborz Jahanian Radar 4330422 * obj-c++.dg/try-catch-15.mm: New 2005-10-07 Fariborz Jahanian Radar 4204796 * obj-c++.dg/try-catch-12.mm: New * obj-c++.dg/try-catch-13.mm: New * obj-c++.dg/try-catch-14.mm: New * objc.dg/try-catch-11.m: New * objc.dg/try-catch-12.m: New * objc.dg/try-catch-13.m: New From-SVN: r165654 --- gcc/c-family/stub-objc.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gcc/c-family/stub-objc.c') diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c index c6a8cfa..bcce0ae 100644 --- a/gcc/c-family/stub-objc.c +++ b/gcc/c-family/stub-objc.c @@ -67,6 +67,12 @@ objc_check_global_decl (tree ARG_UNUSED (decl)) } tree +objc_non_volatilized_type (tree type) +{ + return type; +} + +tree objc_common_type (tree ARG_UNUSED (type1), tree ARG_UNUSED (type2)) { return 0; -- cgit v1.1