aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.fortran/mixed-lang-stack.c10
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,