summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ruby/ruby/prevent-gc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby/prevent-gc.patch')
-rw-r--r--meta/recipes-devtools/ruby/ruby/prevent-gc.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/prevent-gc.patch b/meta/recipes-devtools/ruby/ruby/prevent-gc.patch
deleted file mode 100644
index 2eaa955fba..0000000000
--- a/meta/recipes-devtools/ruby/ruby/prevent-gc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Fix marshaling with gcc7. Based on upstream revision 57410:
2https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57410
3https://github.com/ruby/ruby/commit/7c1b30a602ab109d8d5388d7dfb3c5b180ba24e1
4https://bugs.ruby-lang.org/issues/13150
5
6with the upstream patches intent ported to Ruby 2.2.5
7
8Upstream-Status: Backport
9
10Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
11
12Index: ruby-2.2.5/marshal.c
13===================================================================
14--- ruby-2.2.5.orig/marshal.c
15+++ ruby-2.2.5/marshal.c
16@@ -17,7 +17,6 @@
17 #include "ruby/io.h"
18 #include "ruby/st.h"
19 #include "ruby/util.h"
20-
21 #include <math.h>
22 #ifdef HAVE_FLOAT_H
23 #include <float.h>
24@@ -985,7 +984,7 @@ marshal_dump(int argc, VALUE *argv)
25 VALUE obj, port, a1, a2;
26 int limit = -1;
27 struct dump_arg *arg;
28- VALUE wrapper; /* used to avoid memory leak in case of exception */
29+ volatile VALUE wrapper; /* used to avoid memory leak in case of exception */
30
31 port = Qnil;
32 rb_scan_args(argc, argv, "12", &obj, &a1, &a2);