From de2e84e5b044d8635387bacd37d6088bd8dffd66 Mon Sep 17 00:00:00 2001
From: Rafael Ávila de Espíndola <respindola@mozilla.com>
Date: Tue, 24 May 2011 18:52:31 -0400
Subject: Only one gc glue.

---
 src/rt/rust_crate.cpp  | 5 -----
 src/rt/rust_internal.h | 5 ++---
 src/rt/rust_task.cpp   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/rt')

diff --git a/src/rt/rust_crate.cpp b/src/rt/rust_crate.cpp
index 2e312c8c564..0b63e4bd40e 100644
--- a/src/rt/rust_crate.cpp
+++ b/src/rt/rust_crate.cpp
@@ -11,11 +11,6 @@ rust_crate::get_relocation_diff() const {
   return ((uintptr_t)this - self_addr);
 }
 
-uintptr_t
-rust_crate::get_gc_glue() const {
-  return ((uintptr_t)this + gc_glue_off);
-}
-
 rust_crate::mem_area::mem_area(rust_dom *dom, uintptr_t pos, size_t sz)
   : dom(dom),
     base(pos),
diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h
index 03022812a09..9d7f0e56ad1 100644
--- a/src/rt/rust_internal.h
+++ b/src/rt/rust_internal.h
@@ -231,11 +231,11 @@ class rust_crate {
     ptrdiff_t debug_info_off;     // Offset from this to .debug_info.
     size_t debug_info_sz;         // Size of .debug_info.
 
-    ptrdiff_t activate_glue_off;
     ptrdiff_t pad;
     ptrdiff_t pad2;
-    ptrdiff_t gc_glue_off;
     ptrdiff_t pad3;
+    ptrdiff_t pad4;
+    ptrdiff_t pad5;
 
 public:
 
@@ -247,7 +247,6 @@ public:
 
     uintptr_t get_image_base() const;
     ptrdiff_t get_relocation_diff() const;
-    uintptr_t get_gc_glue() const;
 
     struct mem_area
     {
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index bd57eb89cca..b660c5fb545 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -380,7 +380,7 @@ rust_task::gc(size_t nargs)
 {
     DLOG(dom, task,
              "task %s @0x%" PRIxPTR " garbage collecting", name, this);
-    run_after_return(nargs, dom->root_crate->get_gc_glue());
+    // run_after_return(nargs, rust_gc_glue);
 }
 
 void
-- 
cgit 1.4.1-3-g733a5