Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kyte <alexmkyte@gmail.com>2018-10-11 00:25:44 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2018-10-11 00:25:44 +0300
commit6b9b24c5832cf58f74fd9cf956d922edace2496d (patch)
tree6ae0d4c818518ee1b20c981e4385b66c9e357093
parentb4067405d3ad19fd7a3a1d7cd38b1f92986c2841 (diff)
[runtime] Fixup stacktrace creation on s390x (#11073)
* [runtime] Fix mismatched parenthesis on exc-s390x * [runtime] Fix mismatched static function type declaration on s390x * [runtime] Fixup b7c18caf0c for s390x
-rw-r--r--mono/mini/exceptions-s390x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mono/mini/exceptions-s390x.c b/mono/mini/exceptions-s390x.c
index 86f37429594..ffbd6ed80bd 100644
--- a/mono/mini/exceptions-s390x.c
+++ b/mono/mini/exceptions-s390x.c
@@ -71,7 +71,7 @@
/*------------------------------------------------------------------*/
static void throw_exception (MonoObject *, unsigned long, unsigned long,
- gulong *, gdouble *, gint32 *, guint, gboolean);
+ host_mgreg_t *, gdouble *, gint32 *, guint, gboolean, gboolean);
static gpointer mono_arch_get_throw_exception_generic (int, MonoTrampInfo **,
int, gboolean, gboolean, gboolean);
static void handle_signal_exception (gpointer);
@@ -375,7 +375,7 @@ mono_arch_get_throw_exception_generic (int size, MonoTrampInfo **info,
*info = mono_tramp_info_create (corlib ? "throw_corlib_exception"
: (rethrow ? "rethrow_exception"
: (preserve_ips ? "rethrow_preserve_exception"
- : "throw_exception"),
+ : "throw_exception")),
start, code - start, ji, unwind_ops);
return start;