diff options
| author | Jason Merrill <jason@redhat.com> | 2010-05-27 14:21:31 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-05-27 14:21:31 -0400 |
| commit | e239e1bf32bd3ddccec4a068c571be0ab87e574c (patch) | |
| tree | fa8344e013d4316ebadbfc12c7251e115a22b983 /gcc | |
| parent | 1409846ff7bc7a8f0d0e943d28b59c76504637e5 (diff) | |
| download | gcc-releases/gcc-3.2.zip gcc-releases/gcc-3.2.tar.gz gcc-releases/gcc-3.2.tar.bz2 | |
Allow compilation with GCC 4.4.releases/gcc-3.2
include/
* obstack.h: Update to GCC 3.3 version.
gcc/
* system.h: Don't poison malloc.
gcc/cp/
* decl.c (current_binding_level): Add *&.
* parse.y (constructor_declarator): Fix for bison pedantry.
From-SVN: r159937
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 | ||||
| -rw-r--r-- | gcc/cp/parse.y | 8 | ||||
| -rw-r--r-- | gcc/system.h | 2 |
5 files changed, 17 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a6e456c..a0cf654 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2010-05-27 Jason Merrill <jason@redhat.com> + + * system.h: Don't poison malloc. + 2003-05-06 Richard Henderson <rth@redhat.com> * unwind-dw2.c (uw_update_context_1): Only set cfa as sp if diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 81ff7e6..0ae391e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-05-27 Jason Merrill <jason@redhat.com> + + * decl.c (current_binding_level): Add *&. + * parse.y (constructor_declarator): Fix for bison pedantry. + 2003-04-22 Release Manager * GCC 3.2.3 Released. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 82ea227..1093302 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -454,9 +454,9 @@ struct binding_level /* The binding level currently in effect. */ #define current_binding_level \ - (cfun && cp_function_chain->bindings \ - ? cp_function_chain->bindings \ - : scope_chain->bindings) + (*(cfun && cp_function_chain->bindings \ + ? &cp_function_chain->bindings \ + : &scope_chain->bindings)) /* The binding level of the current class, if any. */ diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index e929ebe..5c69c58 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -799,7 +799,7 @@ fndef: constructor_declarator: nested_name_specifier SELFNAME '(' - { $$ = begin_constructor_declarator ($1, $2); } + { $<ttype>$ = begin_constructor_declarator ($1, $2); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>4, $5, $7, $8); } | nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -807,7 +807,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $4, $5); } | global_scope nested_name_specifier SELFNAME '(' - { $$ = begin_constructor_declarator ($2, $3); } + { $<ttype>$ = begin_constructor_declarator ($2, $3); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>5, $6, $8, $9); } | global_scope nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -815,7 +815,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $5, $6); } | nested_name_specifier self_template_type '(' - { $$ = begin_constructor_declarator ($1, $2); } + { $<ttype>$ = begin_constructor_declarator ($1, $2); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>4, $5, $7, $8); } | nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -823,7 +823,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $4, $5); } | global_scope nested_name_specifier self_template_type '(' - { $$ = begin_constructor_declarator ($2, $3); } + { $<ttype>$ = begin_constructor_declarator ($2, $3); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>5, $6, $8, $9); } | global_scope nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt diff --git a/gcc/system.h b/gcc/system.h index 9747fe0..7082860 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -589,7 +589,7 @@ typedef char _Bool; #undef realloc #undef calloc #undef strdup - #pragma GCC poison malloc realloc calloc strdup + #pragma GCC poison realloc calloc strdup /* Old target macros that have moved to the target hooks structure. */ #pragma GCC poison ASM_OPEN_PAREN ASM_CLOSE_PAREN \ |