summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-05 06:27:43 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-05 06:27:43 +0000
commit77857bfc879377dc726b84173ec849c549e5b470 (patch)
treefc7d8ffe4b4b8626aa00ab9bcc89f84dfb4278a4
parent2ae30c3fa212e979f950e8e7bbcadf0334e671d4 (diff)
* gc.c (before_gc_sweep): don't optimize it to avoid segv on Ubuntu
10.04 gcc 4.4. http://u32.rubyci.org/~chkbuild/ruby-trunk/log/20130527T190301Z.diff.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--gc.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 863e3094ac..e2ef18565c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 5 15:26:10 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * gc.c (before_gc_sweep): don't optimize it to avoid segv on Ubuntu
+ 10.04 gcc 4.4.
+ http://u32.rubyci.org/~chkbuild/ruby-trunk/log/20130527T190301Z.diff.html.gz
+
Wed Jun 5 09:46:46 2013 NARUSE, Yui <naruse@ruby-lang.org>
* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
diff --git a/gc.c b/gc.c
index f3fb37207b..6e56e11022 100644
--- a/gc.c
+++ b/gc.c
@@ -2276,6 +2276,10 @@ ready_to_gc(rb_objspace_t *objspace)
return TRUE;
}
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 4
+# pragma GCC push_options
+# pragma GCC optimize ("O0")
+#endif
static void
before_gc_sweep(rb_objspace_t *objspace)
{
@@ -2297,6 +2301,9 @@ before_gc_sweep(rb_objspace_t *objspace)
rb_sweep_method_entry(GET_VM());
}
}
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 4
+# pragma GCC pop_options
+#endif
static void
after_gc_sweep(rb_objspace_t *objspace)