diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-08-15 11:59:18 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-08-15 11:59:18 +0200 |
| commit | 3d11c30a6e839cfc126353fd1b35960301a1b6a0 (patch) | |
| tree | 9e1faee0287262554df1f1c3154474c1453dd674 | |
| parent | 547ce8f00b4ef826bdc9bf9a74f119fe9768852e (diff) | |
| download | gdb-3d11c30a6e839cfc126353fd1b35960301a1b6a0.zip gdb-3d11c30a6e839cfc126353fd1b35960301a1b6a0.tar.gz gdb-3d11c30a6e839cfc126353fd1b35960301a1b6a0.tar.bz2 | |
[gdb/testsuite] Fix charlen type in mixed-lang-stack.c
In gdb.fortran/mixed-lang-stack.f90, we have fortran function mixed_func_1d:
...
subroutine mixed_func_1d(a, b, c, d, str)
use, intrinsic :: iso_c_binding, only: c_int, c_float, c_double
use, intrinsic :: iso_c_binding, only: c_float_complex
implicit none
integer(c_int) :: a
real(c_float) :: b
real(c_double) :: c
complex(c_float_complex) :: d
character(len=*) :: str
...
which we declare in C in gdb.fortran/mixed-lang-stack.c like this:
...
extern void mixed_func_1d_ (int *, float *, double *, complex float *,
char *, size_t);
...
The fortran string parameter str is passed as a char *, and an additional
argument str_ for the string length. The type used for the string length
argument is size_t, but for gcc 7 and earlier, the actual type is int
instead ( see
https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html ).
Fix this by declaring the string length type depending on the gcc version:
...
#if !defined (__GNUC__) || __GNUC__ > 7
typedef size_t fortran_charlen_t;
#else
typedef int fortran_charlen_t;
...
Tested on x86_64-linux, with gcc-7 and gcc-8.
gdb/testsuite/ChangeLog:
2020-08-15 Tom de Vries <tdevries@suse.de>
* gdb.fortran/mixed-lang-stack.c (fortran_charlen_t): New type.
(mixed_func_1d_): Use fortran_charlen_t in decl.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/mixed-lang-stack.c | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 54a0ab5..d855615 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2020-08-15 Tom de Vries <tdevries@suse.de> + * gdb.fortran/mixed-lang-stack.c (fortran_charlen_t): New type. + (mixed_func_1d_): Use fortran_charlen_t in decl. + +2020-08-15 Tom de Vries <tdevries@suse.de> + PR backtrace/26390 * gdb.fortran/mixed-lang-stack.exp: Call bt with -frame-arguments all. Update expected pattern. diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.c b/gdb/testsuite/gdb.fortran/mixed-lang-stack.c index 0d254cd..cd96419 100644 --- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.c +++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.c @@ -22,8 +22,16 @@ struct some_struct float a, b; }; +/* See https://gcc.gnu.org/onlinedocs/gfortran/\ + Argument-passing-conventions.html. */ +#if !defined (__GNUC__) || __GNUC__ > 7 +typedef size_t fortran_charlen_t; +#else +typedef int fortran_charlen_t; +#endif + extern void mixed_func_1d_ (int *, float *, double *, complex float *, - char *, size_t); + char *, fortran_charlen_t); void mixed_func_1c (int a, float b, double c, complex float d, char *f, |