From d885974cbeb2443dcbeb4badeeb96e7e07490d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Tue, 24 May 2016 16:25:13 +0200
Subject: Revert perlish_exit() hunk from Coro-6.49-perl_5_24.patch
Otherwise tests fail on i686.
---
Coro-6.49-perl_5_24.patch | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/Coro-6.49-perl_5_24.patch b/Coro-6.49-perl_5_24.patch
index f0234c1..2a5c7ff 100644
--- a/Coro-6.49-perl_5_24.patch
+++ b/Coro-6.49-perl_5_24.patch
@@ -5,6 +5,9 @@ Author: Anonymous
Origin:
https://paste.debian.net/688072
Last-Update: 2016-05-20
+Petr Pisar: perlish_exit() changes reverted as they causes Perl panic in
+t/12_exit.t on i686.
+
--- a/Coro/State.xs
+++ b/Coro/State.xs
@@ -39,6 +39,10 @@
@@ -117,19 +120,6 @@ Last-Update: 2016-05-20
PUTBACK;
cb = hv_fetch ((HV *)SvRV (coro_current),
"_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID |
G_DISCARD);
-@@ -1488,7 +1531,11 @@ transfer_tail (pTHX)
- static void ecb_noinline ecb_cold
- perlish_exit (pTHX)
- {
-- int exitstatus = perl_destruct (PL_curinterp);
-+ int exitstatus;
-+ /* Because we've skipped the "not essential" things, we've not
popped all */
-+ /* the scopes, and perl_destruct has an assert() that checks this. */
-+ PL_scopestack_ix = 1;
-+ exitstatus = perl_destruct (PL_curinterp);
- perl_free (PL_curinterp);
- exit (exitstatus);
- }
@@ -3596,15 +3643,16 @@ BOOT:
DEFSV;
ERRSV;
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Coro.git/commit/?h=epel7&id=d...