diff options
| author | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
| commit | 3f73d6ef90458b45bbbb33ef4c2b174d4662a22d (patch) | |
| tree | 1b5f0d96c51b51168b3713058a1b62e92f1136eb /gcc-4.6/gcc/fortran/trans-types.c | |
| parent | d7030123e04baab5dbff9c9ee04c0de99bd9a774 (diff) | |
| download | toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.gz toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.bz2 toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.zip | |
Sync down FSF r184235@google/gcc-4_6_2-mobile branch
1) Get mostly new patches from FSF gcc-4.6 branch
2) Fix PR52129
3) Insert GNU-stack note for all ARM targets
Change-Id: I2b9926981210e517e4021242908074319a91d6bd
Diffstat (limited to 'gcc-4.6/gcc/fortran/trans-types.c')
| -rw-r--r-- | gcc-4.6/gcc/fortran/trans-types.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc-4.6/gcc/fortran/trans-types.c b/gcc-4.6/gcc/fortran/trans-types.c index 258685e10..ca0789632 100644 --- a/gcc-4.6/gcc/fortran/trans-types.c +++ b/gcc-4.6/gcc/fortran/trans-types.c @@ -2092,6 +2092,9 @@ gfc_copy_dt_decls_ifequal (gfc_symbol *from, gfc_symbol *to, gfc_component *to_cm; gfc_component *from_cm; + if (from == to) + return 1; + if (from->backend_decl == NULL || !gfc_compare_derived_types (from, to)) return 0; @@ -2329,6 +2332,9 @@ gfc_get_derived_type (gfc_symbol * derived) && !c->attr.proc_pointer) field_type = build_pointer_type (field_type); + if (c->attr.pointer) + field_type = gfc_nonrestricted_type (field_type); + /* vtype fields can point to different types to the base type. */ if (c->ts.type == BT_DERIVED && c->ts.u.derived->attr.vtype) field_type = build_pointer_type_for_mode (TREE_TYPE (field_type), |