commit 9d3ba24f05f251e9a8c7034315afca6c08b705ad
author TDYa127 <tdy@google.com> Mon May 07 08:28:27 2012 -0700
committer Shih-wei Liao <sliao@google.com> Mon May 07 10:58:24 2012 -0700
tree e9f62f7b8dcc7c5001bc1429e327a25139e28d4b
parent 145d491d1a30b291eb3ea608507a04451237f327

Fix compiling breakage (SIGSEGV) from doing "make -jN", where N > 1.

Change-Id: Ic030cb6b31326536f1507e63c9922f24b70c2d9e

src/compiler_llvm/art_module.ll

diff --git a/src/compiler_llvm/art_module.ll b/src/compiler_llvm/art_module.ll
index 35cfaac..a2da2b6 100644
--- a/src/compiler_llvm/art_module.ll
+++ b/src/compiler_llvm/art_module.ll
@@ -35,7 +35,7 @@
 ; Thread
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-declare %JavaObject* @art_get_current_thread_from_code() readonly
+declare %JavaObject* @art_get_current_thread_from_code()
 declare void @art_set_current_thread_from_code(%JavaObject*)
 
 declare void @art_lock_object_from_code(%JavaObject*, %JavaObject*)
@@ -52,7 +52,7 @@
 ; Exception
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-declare i1 @art_is_exception_pending_from_code() readonly
+declare i1 @art_is_exception_pending_from_code()
 
 declare void @art_throw_div_zero_from_code()
 declare void @art_throw_array_bounds_from_code(i32, i32)

src/compiler_llvm/generated/art_module.cc

diff --git a/src/compiler_llvm/generated/art_module.cc b/src/compiler_llvm/generated/art_module.cc
index a337e40..b3963ef 100644
--- a/src/compiler_llvm/generated/art_module.cc
+++ b/src/compiler_llvm/generated/art_module.cc
@@ -359,14 +359,6 @@
 func_art_get_current_thread_from_code->setCallingConv(CallingConv::C);
 }
 AttrListPtr func_art_get_current_thread_from_code_PAL;
-{
- SmallVector<AttributeWithIndex, 4> Attrs;
- AttributeWithIndex PAWI;
- PAWI.Index = 4294967295U; PAWI.Attrs = Attribute::None  | Attribute::ReadOnly;
- Attrs.push_back(PAWI);
- func_art_get_current_thread_from_code_PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
- 
-}
 func_art_get_current_thread_from_code->setAttributes(func_art_get_current_thread_from_code_PAL);
 
 Function* func_art_set_current_thread_from_code = mod->getFunction("art_set_current_thread_from_code");
@@ -444,14 +436,6 @@
 func_art_is_exception_pending_from_code->setCallingConv(CallingConv::C);
 }
 AttrListPtr func_art_is_exception_pending_from_code_PAL;
-{
- SmallVector<AttributeWithIndex, 4> Attrs;
- AttributeWithIndex PAWI;
- PAWI.Index = 4294967295U; PAWI.Attrs = Attribute::None  | Attribute::ReadOnly;
- Attrs.push_back(PAWI);
- func_art_is_exception_pending_from_code_PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
- 
-}
 func_art_is_exception_pending_from_code->setAttributes(func_art_is_exception_pending_from_code_PAL);
 
 Function* func_art_throw_div_zero_from_code = mod->getFunction("art_throw_div_zero_from_code");