diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-12-19 10:21:17 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-12-19 10:21:17 +0100 |
| commit | 36085529ca2fd651b3109eb920bf8010859db0be (patch) | |
| tree | 401cf7c57008a33760d801e43e90f01f62473c0b /gcc/fortran/trans-decl.c | |
| parent | 168c15bedced6139fc1aef661f28efbc6b9d934d (diff) | |
| download | gcc-36085529ca2fd651b3109eb920bf8010859db0be.zip gcc-36085529ca2fd651b3109eb920bf8010859db0be.tar.gz gcc-36085529ca2fd651b3109eb920bf8010859db0be.tar.bz2 | |
re PR fortran/55636 (Fortran name mangling collides with user namespace)
2012-12-19 Tobias Burnus <burnus@net-b.de>
Jakub Jelinek <jakub@redhat.com>
Janus Weil <janus@gcc.gnu.org>
PR fortran/55636
PR fortran/55733
* gfortran.h (GFC_PREFIX): Define.
* trans-decl.c (gfc_create_string_length): For VAR_DECLs that
will be TREE_STATIC, use GFC_PREFIX to mangle the names. Handle
-fno-automatic
(gfc_trans_deferred_vars): Don't free variables SAVEd via
-fno-automatic.
2012-12-19 Tobias Burnus <burnus@net-b.de>
PR fortran/55733
* gfortran.dg/save_5.f90: New.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
Co-Authored-By: Janus Weil <janus@gcc.gnu.org>
From-SVN: r194604
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index dbc5a10..3202840 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -1089,8 +1089,22 @@ gfc_create_string_length (gfc_symbol * sym) tree length; const char *name; - /* Also prefix the mangled name. */ - if (sym->module) + bool static_length = sym->attr.save + || sym->ns->proc_name->attr.flavor == FL_MODULE + || gfc_option.flag_max_stack_var_size == 0; + + /* Also prefix the mangled name. We need to call GFC_PREFIX for static + variables as some systems do not support the "." in the assembler name. + For nonstatic variables, the "." does not appear in assembler. */ + if (static_length) + { + if (sym->module) + name = gfc_get_string (GFC_PREFIX ("%s_MOD_%s"), sym->module, + sym->name); + else + name = gfc_get_string (GFC_PREFIX ("%s"), sym->name); + } + else if (sym->module) name = gfc_get_string (".__%s_MOD_%s", sym->module, sym->name); else name = gfc_get_string (".%s", sym->name); @@ -1105,7 +1119,7 @@ gfc_create_string_length (gfc_symbol * sym) sym->ts.u.cl->backend_decl = length; - if (sym->attr.save || sym->ns->proc_name->attr.flavor == FL_MODULE) + if (static_length) TREE_STATIC (length) = 1; if (sym->ns->proc_name->attr.flavor == FL_MODULE @@ -3702,7 +3716,7 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) || (sym->ts.type == BT_CLASS && CLASS_DATA (sym)->attr.allocatable))) { - if (!sym->attr.save) + if (!sym->attr.save && gfc_option.flag_max_stack_var_size != 0) { tree descriptor = NULL_TREE; |