commit 8ed6d61ac0864035936b74ef583399d7ab5f7911
author Mathieu Chartier <mathieuc@google.com> Tue Oct 09 14:39:28 2012 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Oct 09 14:39:28 2012 -0700
tree cc8d08cf730c9de3d3d601ecb387b7623efb158b
parent 137e88f798857321f4007631fdf052d2830ec2c4

Fix LLVM build.

Needed to change an include and two other lines.

Change-Id: Id3a2dbe81ea97374fbba12739f84f910d32ac6f9

src/compiler_llvm/runtime_support_builder.cc

diff --git a/src/compiler_llvm/runtime_support_builder.cc b/src/compiler_llvm/runtime_support_builder.cc
index 76665f7..b51a822 100644
--- a/src/compiler_llvm/runtime_support_builder.cc
+++ b/src/compiler_llvm/runtime_support_builder.cc
@@ -16,7 +16,7 @@
 
 #include "runtime_support_builder.h"
 
-#include "card_table.h"
+#include "gc/card_table.h"
 #include "ir_builder.h"
 #include "monitor.h"
 #include "object.h"
@@ -234,9 +234,9 @@
                                                irb_.getInt8Ty()->getPointerTo(),
                                                kTBAAConstJObject);
   Value* target_addr_int = irb_.CreatePtrToInt(target_addr, irb_.getPtrEquivIntTy());
-  Value* card_no = irb_.CreateLShr(target_addr_int, irb_.getPtrEquivInt(GC_CARD_SHIFT));
+  Value* card_no = irb_.CreateLShr(target_addr_int, irb_.getPtrEquivInt(CardTable::kCardShift));
   Value* card_table_entry = irb_.CreateGEP(card_table, card_no);
-  irb_.CreateStore(irb_.getInt8(GC_CARD_DIRTY), card_table_entry, kTBAARuntimeInfo);
+  irb_.CreateStore(irb_.getInt8(CardTable::kCardDirty), card_table_entry, kTBAARuntimeInfo);
   irb_.CreateBr(bb_cont);
 
   irb_.SetInsertPoint(bb_cont);