diff options
| author | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-09-22 02:24:06 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-09-22 02:24:06 +0000 |
| commit | 1ae57298f9397b3a8476060f57045838847af293 (patch) | |
| tree | 04a7f9bcf80cff25bb0471a503a7df47aef54770 | |
| parent | ad9f20cbce22c10f62d7f4c1b12d42b144454760 (diff) | |
| download | gcc-1ae57298f9397b3a8476060f57045838847af293.zip gcc-1ae57298f9397b3a8476060f57045838847af293.tar.gz gcc-1ae57298f9397b3a8476060f57045838847af293.tar.bz2 | |
c-decl.c (implicitly_declare): Call maybe_apply_renaming_pragma.
* c-decl.c (implicitly_declare): Call maybe_apply_renaming_pragma.
(finish_decl): Likewise.
From-SVN: r87840
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-decl.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pragma-re-3.c | 18 |
4 files changed, 35 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6565150..147d8d8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-09-21 Mark Mitchell <mark@codesourcery.com> + + * c-decl.c (implicityl_declare): Call maybe_apply_renaming_pragma. + (finish_decl): Likewise. + 2004-09-21 Devang Patel <dpatel@apple.com> * tree.def (VEC_COND_EXPR): New tree node. diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 76c1a08..98f1580 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -2159,6 +2159,8 @@ implicitly_declare (tree functionid) { struct c_binding *b; tree decl = 0; + tree asmspec_tree; + for (b = I_SYMBOL_BINDING (functionid); b; b = b->shadowed) { if (B_IN_SCOPE (b, external_scope)) @@ -2230,6 +2232,9 @@ implicitly_declare (tree functionid) TREE_PUBLIC (decl) = 1; C_DECL_IMPLICIT (decl) = 1; implicit_decl_warning (functionid, 0); + asmspec_tree = maybe_apply_renaming_pragma (decl, /*asmname=*/NULL); + if (asmspec_tree) + set_user_assembler_name (decl, TREE_STRING_POINTER (asmspec_tree)); /* C89 says implicit declarations are in the innermost block. So we record the decl in the standard fashion. */ @@ -3064,7 +3069,8 @@ finish_decl (tree decl, tree init, tree asmspec_tree) const char *asmspec = 0; /* If a name was specified, get the string. */ - if (current_scope == file_scope) + if ((TREE_CODE (decl) == FUNCTION_DECL || TREE_CODE (decl) == VAR_DECL) + && DECL_FILE_SCOPE_P (decl)) asmspec_tree = maybe_apply_renaming_pragma (decl, asmspec_tree); if (asmspec_tree) asmspec = TREE_STRING_POINTER (asmspec_tree); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 11d8dfc..fb20f32 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,8 @@ - 2004-09-17 Matt Austern <austern@apple.com> +2004-09-21 Mark Mitchell <mark@codesourcery.com> + + * gcc.dg/pragma-re-3.c: New test. + +2004-09-17 Matt Austern <austern@apple.com> PR c++/15049 * g++.dg/other/anon3.C: New. diff --git a/gcc/testsuite/gcc.dg/pragma-re-3.c b/gcc/testsuite/gcc.dg/pragma-re-3.c new file mode 100644 index 0000000..4a73c41 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pragma-re-3.c @@ -0,0 +1,18 @@ +/* { dg-do link { target *-*-solaris* } } */ + +#pragma redefine_extname f1 f +#pragma redefine_extname g1 g + +void f() { + extern int f1(); + f1(); +} + +void g() { + g1(); +} + +int main () { + f(); + g(); +} |