diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2010-11-20 15:55:14 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2010-11-20 15:55:14 +0200 |
| commit | c1775967e3898cba767bd4452383a04c18c86623 (patch) | |
| tree | 53f3c7fe640e54a9390a4670cf27c9d347858515 /gcc | |
| parent | 4942af9b83b8040720ec09a48a0a8f4d0b08bde3 (diff) | |
| download | gcc-c1775967e3898cba767bd4452383a04c18c86623.zip gcc-c1775967e3898cba767bd4452383a04c18c86623.tar.gz gcc-c1775967e3898cba767bd4452383a04c18c86623.tar.bz2 | |
Fix size_type_node and sizetype in Fortran frontend
From-SVN: r166976
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/f95-lang.c | 13 | ||||
| -rw-r--r-- | gcc/fortran/trans-types.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0961df3..69312db 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2010-11-20 Janne Blomqvist <jb@gcc.gnu.org> + + * f95-lang.c (gfc_init_decl_processing): Set size_type_node as + unsigned int of pointer size and set sizetype based on that. + * trans-types.c (gfc_init_types): Don't set size_type_node to an + unsigned type. + 2010-11-17 Joseph Myers <joseph@codesourcery.com> * f95-lang.c (gfc_be_parse_file): Take no arguments. diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index 3ed500b..a3ac860 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -582,15 +582,10 @@ gfc_init_decl_processing (void) only use it for actual characters, not for INTEGER(1). Also, we want double_type_node to actually have double precision. */ build_common_tree_nodes (false); - /* x86_64 mingw32 has a sizetype of "unsigned long long", most other hosts - have a sizetype of "unsigned long". Therefore choose the correct size - in mostly target independent way. */ - if (TYPE_MODE (long_unsigned_type_node) == ptr_mode) - set_sizetype (long_unsigned_type_node); - else if (TYPE_MODE (long_long_unsigned_type_node) == ptr_mode) - set_sizetype (long_long_unsigned_type_node); - else - set_sizetype (long_unsigned_type_node); + + size_type_node = gfc_build_uint_type (POINTER_SIZE); + set_sizetype (size_type_node); + build_common_tree_nodes_2 (0); void_list_node = build_tree_list (NULL_TREE, void_type_node); diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index 0571bd1..66dd99e 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -919,8 +919,6 @@ gfc_init_types (void) gfc_max_array_element_size = build_int_cst_wide (long_unsigned_type_node, lo, hi); - size_type_node = gfc_array_index_type; - boolean_type_node = gfc_get_logical_type (gfc_default_logical_kind); boolean_true_node = build_int_cst (boolean_type_node, 1); boolean_false_node = build_int_cst (boolean_type_node, 0); |