diff options
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/c-decl.c | 6 | ||||
| -rw-r--r-- | gcc/c-tree.h | 5 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 4 |
4 files changed, 10 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fb479a4..410bc26 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-05-10 Joseph Myers <joseph@codesourcery.com> + + * c-decl.c (c_override_global_bindings_to_false): Remove. + (global_bindings_p): Don't check + c_override_global_bindings_to_false. + * c-tree.h (c_override_global_bindings_to_false): Remove. + * c-typeck.c (composite_type): Don't set + c_override_global_bindings_to_false. + 2011-05-10 Michael Meissner <meissner@linux.vnet.ibm.com> PR target/48857, 48495 diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 6e359a9..3843f77 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -147,10 +147,6 @@ static int warn_about_return_type; static bool undef_nested_function; -/* True means global_bindings_p should return false even if the scope stack - says we are in file scope. */ -bool c_override_global_bindings_to_false; - /* Each c_binding structure describes one binding of an identifier to a decl. All the decls in a scope - irrespective of namespace - are @@ -850,7 +846,7 @@ objc_mark_locals_volatile (void *enclosing_blk) bool global_bindings_p (void) { - return current_scope == file_scope && !c_override_global_bindings_to_false; + return current_scope == file_scope; } void diff --git a/gcc/c-tree.h b/gcc/c-tree.h index e2b42bf..95a0ba2 100644 --- a/gcc/c-tree.h +++ b/gcc/c-tree.h @@ -597,11 +597,6 @@ extern int current_function_returns_abnormally; extern int system_header_p; -/* True means global_bindings_p should return false even if the scope stack - says we are in file scope. */ - -extern bool c_override_global_bindings_to_false; - /* In c-decl.c */ extern void c_finish_incomplete_decl (tree); extern void c_write_global_declarations (void); diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 545cd01..6016db2 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -507,9 +507,6 @@ composite_type (tree t1, tree t2) /* If both args specify argument types, we must merge the two lists, argument by argument. */ - /* Tell global_bindings_p to return false so that variable_size - doesn't die on VLAs in parameter types. */ - c_override_global_bindings_to_false = true; len = list_length (p1); newargs = 0; @@ -592,7 +589,6 @@ composite_type (tree t1, tree t2) parm_done: ; } - c_override_global_bindings_to_false = false; t1 = build_function_type (valtype, newargs); t1 = qualify_type (t1, t2); /* ... falls through ... */ |