diff options
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 135d503..a68b46d71 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,13 @@ +2010-10-05 Nicola Pero <nicola.pero@meta-innovation.com> + + Merge from 'apple/trunk' branch on FSF servers. + + 2005-10-17 Fariborz Jahanian <fjahanian@apple.com> + + Radar 4290840 + * objc-act.c (objc_start_method_definition): Check for error_mark_node for + the selector name and make a quick exit. + 2010-10-04 Andi Kleen <ak@linux.intel.com> * Make-lang.in (cc1obj-dummy, cc1obj): Add + to build rule. diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index dffdb71..5aaadc67 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -821,6 +821,9 @@ objc_start_method_definition (tree decl, tree attributes) return false; } + if (decl != NULL_TREE && METHOD_SEL_NAME (decl) == error_mark_node) + return false; + if (attributes) warning_at (input_location, OPT_Wattributes, "method attributes are not available in this version" |