diff options
| -rw-r--r-- | gdb/f-exp.y | 4 | ||||
| -rw-r--r-- | gdb/f-lang.c | 4 | ||||
| -rw-r--r-- | gdb/f-lang.h | 1 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/type-kinds.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/types.exp | 2 |
5 files changed, 11 insertions, 2 deletions
diff --git a/gdb/f-exp.y b/gdb/f-exp.y index ae5cc4e..d6103a0 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -1051,7 +1051,9 @@ convert_to_kind_type (struct type *basetype, int kind) } else if (basetype == parse_f_type (pstate)->builtin_integer) { - if (kind == 2) + if (kind == 1) + return parse_f_type (pstate)->builtin_integer_s1; + else if (kind == 2) return parse_f_type (pstate)->builtin_integer_s2; else if (kind == 4) return parse_f_type (pstate)->builtin_integer; diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 72dd136..1f95ae8 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -1622,6 +1622,10 @@ build_fortran_types (struct gdbarch *gdbarch) builtin_f_type->builtin_logical_s1 = arch_boolean_type (gdbarch, TARGET_CHAR_BIT, 1, "logical*1"); + builtin_f_type->builtin_integer_s1 + = arch_integer_type (gdbarch, TARGET_CHAR_BIT, 0, + "integer*1"); + builtin_f_type->builtin_integer_s2 = arch_integer_type (gdbarch, gdbarch_short_bit (gdbarch), 0, "integer*2"); diff --git a/gdb/f-lang.h b/gdb/f-lang.h index f92d3b0..512325f 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -319,6 +319,7 @@ struct builtin_f_type { struct type *builtin_character; struct type *builtin_integer; + struct type *builtin_integer_s1; struct type *builtin_integer_s2; struct type *builtin_integer_s8; struct type *builtin_logical; diff --git a/gdb/testsuite/gdb.fortran/type-kinds.exp b/gdb/testsuite/gdb.fortran/type-kinds.exp index b054803..47b788b 100644 --- a/gdb/testsuite/gdb.fortran/type-kinds.exp +++ b/gdb/testsuite/gdb.fortran/type-kinds.exp @@ -56,6 +56,7 @@ proc test_basic_parsing_of_type_kinds {} { test_cast_1_to_type_kind "logical" "8" "\\.TRUE\\." "8" test_cast_1_to_type_kind "integer" "" "1" "4" + test_cast_1_to_type_kind "integer" "1" "1" "1" test_cast_1_to_type_kind "integer" "2" "1" "2" test_cast_1_to_type_kind "integer" "4" "1" "4" test_cast_1_to_type_kind "integer" "8" "1" "8" @@ -92,6 +93,7 @@ proc test_old_star_type_sizes {} { gdb_test "p ((logical*4) 1)" " = \\.TRUE\\." gdb_test "p ((logical*8) 1)" " = \\.TRUE\\." + gdb_test "p ((integer*1) 1)" " = 1" gdb_test "p ((integer*2) 1)" " = 1" gdb_test "p ((integer*4) 1)" " = 1" gdb_test "p ((integer*8) 1)" " = 1" diff --git a/gdb/testsuite/gdb.fortran/types.exp b/gdb/testsuite/gdb.fortran/types.exp index 7bd51ca..625e021 100644 --- a/gdb/testsuite/gdb.fortran/types.exp +++ b/gdb/testsuite/gdb.fortran/types.exp @@ -74,7 +74,7 @@ proc test_float_literal_types_accepted {} { # Test the the primitive Fortran types, those that GDB should always # know, even if the program does not define them, are in fact, known. proc test_primitive_types_known {} { - foreach type {void character logical*1 integer*2 integer*8 \ + foreach type {void character logical*1 integer*1 integer*2 integer*8 \ logical*2 logical*8 integer logical*4 real \ real*8 real*16} { gdb_test "ptype $type" [string_to_regexp "type = $type"] |