From nicolas.geoffray at lip6.fr  Thu Dec  3 07:45:03 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Thu, 03 Dec 2009 15:45:03 -0000
Subject: [vmkit-commits] [vmkit] r90455 - /vmkit/trunk/www/get_started.html
Message-ID: <200912031545.nB3Fj30r019323@zion.cs.uiuc.edu>

Author: geoffray
Date: Thu Dec  3 09:45:01 2009
New Revision: 90455

URL: http://llvm.org/viewvc/llvm-project?rev=90455&view=rev
Log:
Disable Werror when building classpath.


Modified:
    vmkit/trunk/www/get_started.html

Modified: vmkit/trunk/www/get_started.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/get_started.html?rev=90455&r1=90454&r2=90455&view=diff

==============================================================================
--- vmkit/trunk/www/get_started.html (original)
+++ vmkit/trunk/www/get_started.html Thu Dec  3 09:45:01 2009
@@ -63,7 +63,7 @@
   <ul>
     <li><tt>tar zxvf classpath-0.97.2.tar.gz</tt></li>
     <li><tt>cd classpath-0.97.2</tt></li>
-    <li><tt>./configure --disable-plugin --disable-examples; make</tt></li>
+    <li><tt>./configure --disable-plugin --disable-examples --disable-Werror; make</tt></li>
     <li><tt>cd lib</li></tt>
     <li><tt>ln -s ../native/jni/gtk-peer/.libs/libgtkpeer.so;</li></tt>
     <li><tt>ln -s ../native/jni/gconf-peer/.libs/libgconfpeer.so;</li></tt>




From nicolas.geoffray at lip6.fr  Thu Dec  3 07:49:27 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Thu, 03 Dec 2009 15:49:27 -0000
Subject: [vmkit-commits] [vmkit] r90456 -
	/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
Message-ID: <200912031549.nB3FnRIc019473@zion.cs.uiuc.edu>

Author: geoffray
Date: Thu Dec  3 09:49:26 2009
New Revision: 90456

URL: http://llvm.org/viewvc/llvm-project?rev=90456&view=rev
Log:
Fix obvious typo.


Modified:
    vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp

Modified: vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp?rev=90456&r1=90455&r2=90456&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp Thu Dec  3 09:49:26 2009
@@ -138,7 +138,7 @@
 #define START_ADDR 0x110000000
 #define END_ADDR 0x170000000
 #else
-#define START_ADDR 0x110000000
+#define START_ADDR 0x10000000
 #define END_ADDR 0x70000000
 #endif
 




From nicolas.geoffray at lip6.fr  Thu Dec  3 07:50:58 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Thu, 03 Dec 2009 15:50:58 -0000
Subject: [vmkit-commits] [vmkit] r90457 -
	/vmkit/trunk/mmtk/magic/LowerMagic.cpp
Message-ID: <200912031550.nB3Fow4b019525@zion.cs.uiuc.edu>

Author: geoffray
Date: Thu Dec  3 09:50:58 2009
New Revision: 90457

URL: http://llvm.org/viewvc/llvm-project?rev=90457&view=rev
Log:
Add include.


Modified:
    vmkit/trunk/mmtk/magic/LowerMagic.cpp

Modified: vmkit/trunk/mmtk/magic/LowerMagic.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/LowerMagic.cpp?rev=90457&r1=90456&r2=90457&view=diff

==============================================================================
--- vmkit/trunk/mmtk/magic/LowerMagic.cpp (original)
+++ vmkit/trunk/mmtk/magic/LowerMagic.cpp Thu Dec  3 09:50:58 2009
@@ -18,6 +18,8 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include <cstdio>
+
 using namespace llvm;
 
 namespace vmmagic {




From nicolas.geoffray at lip6.fr  Tue Dec  8 08:54:05 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Tue, 08 Dec 2009 16:54:05 -0000
Subject: [vmkit-commits] [vmkit] r90861 - in /vmkit/trunk:
 include/jnjvm/JnjvmModule.h include/mvm/UTF8.h
 lib/JnJVM/Compiler/JITInfo.cpp lib/JnJVM/Compiler/JavaAOTCompiler.cpp
 lib/JnJVM/Compiler/JavaJIT.cpp lib/JnJVM/Compiler/JavaJITCompiler.cpp
 lib/JnJVM/Compiler/JnjvmModule.cpp
 lib/JnJVM/Compiler/LowerConstantCalls.cpp
 lib/JnJVM/LLVMRuntime/runtime-default.ll lib/JnJVM/VMCore/JavaClass.cpp
 lib/JnJVM/VMCore/JavaClass.h lib/JnJVM/VMCore/JavaObject.h
 lib/JnJVM/VMCore/JavaRuntimeJIT.cpp lib/Mvm/Runtime/UTF8.cpp
Message-ID: <200912081654.nB8Gs67I013059@zion.cs.uiuc.edu>

Author: geoffray
Date: Tue Dec  8 10:54:05 2009
New Revision: 90861

URL: http://llvm.org/viewvc/llvm-project?rev=90861&view=rev
Log:
Implement a variant of IMT-based interface calls: instead of calling
a stub conflict resolution, inline the stub in the caller.


Modified:
    vmkit/trunk/include/jnjvm/JnjvmModule.h
    vmkit/trunk/include/mvm/UTF8.h
    vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp

Modified: vmkit/trunk/include/jnjvm/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/jnjvm/JnjvmModule.h?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/include/jnjvm/JnjvmModule.h (original)
+++ vmkit/trunk/include/jnjvm/JnjvmModule.h Tue Dec  8 10:54:05 2009
@@ -300,6 +300,7 @@
   llvm::Function* RuntimeDelegateeFunction;
   llvm::Function* ArrayLengthFunction;
   llvm::Function* GetVTFunction;
+  llvm::Function* GetIMTFunction;
   llvm::Function* GetClassFunction;
   llvm::Function* GetVTFromClassFunction;
   llvm::Function* GetVTFromClassArrayFunction;
@@ -343,6 +344,7 @@
   llvm::Constant* OffsetDepthInVTConstant;
   llvm::Constant* OffsetDisplayInVTConstant;
   llvm::Constant* OffsetBaseClassVTInVTConstant;
+  llvm::Constant* OffsetIMTInVTConstant;
   
   llvm::Constant* OffsetBaseClassInArrayClassConstant;
   llvm::Constant* OffsetLogSizeInPrimitiveClassConstant;
@@ -391,6 +393,7 @@
   bool cooperativeGC;
   
   virtual void makeVT(Class* cl) = 0;
+  virtual void makeIMT(Class* cl) = 0;
   
   std::map<llvm::Function*, JavaMethod*> functions;  
   typedef std::map<llvm::Function*, JavaMethod*>::iterator function_iterator;
@@ -543,6 +546,7 @@
   }
 
   virtual void makeVT(Class* cl);
+  virtual void makeIMT(Class* cl);
   
   virtual JavaCompiler* Create(const std::string& ModuleID) {
     return new JavaJITCompiler(ModuleID);
@@ -616,6 +620,7 @@
                                    bool stat);
   
   virtual void makeVT(Class* cl);
+  virtual void makeIMT(Class* cl);
  
   llvm::Constant* HandleMagic(JavaObject* obj, CommonClass* cl);
   virtual llvm::Constant* getFinalObject(JavaObject* obj, CommonClass* cl);

Modified: vmkit/trunk/include/mvm/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/UTF8.h?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/UTF8.h (original)
+++ vmkit/trunk/include/mvm/UTF8.h Tue Dec  8 10:54:05 2009
@@ -57,6 +57,13 @@
   }
 
 	void print(PrintBuffer *pb) const;
+
+	static uint32_t readerHasher(const uint16* buf, sint32 size);
+	
+	uint32_t hash() const {
+		return readerHasher(elements, size);
+	}
+
 };
 
 

Modified: vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp Tue Dec  8 10:54:05 2009
@@ -84,6 +84,7 @@
     virtualSizeConstant = ConstantInt::get(Type::getInt32Ty(context), size);
    
     Mod->makeVT(classDef);
+    Mod->makeIMT(classDef);
   }
 
   return virtualType;

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Tue Dec  8 10:54:05 2009
@@ -1502,8 +1502,10 @@
   } else {
     Elemts.push_back(Constant::getNullValue(PTy));
   }
-
-  
+    
+  // TODO: IMT
+  Elemts.push_back(Constant::getNullValue(PTy));
+ 
   // methods
   for (uint32 i = JavaVirtualTable::getFirstJavaMethodIndex(); i < size; ++i) {
     JavaMethod* meth = ((JavaMethod**)RealVT)[i];
@@ -1761,6 +1763,9 @@
 
 }
 
+void JavaAOTCompiler::makeIMT(Class* cl) {
+}
+
 void JavaAOTCompiler::setMethod(JavaMethod* meth, void* ptr, const char* name) {
   Function* func = getMethodInfo(meth)->getMethod();
   func->setName(name);

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Tue Dec  8 10:54:05 2009
@@ -2180,14 +2180,18 @@
   makeArgs(it, index, args, signature->nbArguments + 1);
   
   const llvm::Type* retType = virtualType->getReturnType();
-  BasicBlock* endBlock = createBasicBlock("end virtual invoke");
+  BasicBlock* endBlock = createBasicBlock("end interface invoke");
   PHINode * node = 0;
   if (retType != Type::getVoidTy(getGlobalContext())) {
     node = PHINode::Create(retType, "", endBlock);
   }
   
   JITVerifyNull(args[0]);
-  
+ 
+
+#if 0
+
+
   Value* zero = module->constantZero;
   Value* one = module->constantOne;
 
@@ -2264,6 +2268,114 @@
     node->addIncoming(ret, currentBlock);
   }
 
+#else
+
+  CommonClass* cl = 0;
+  JavaMethod* meth = 0;
+  ctpInfo->infoOfMethod(index, ACC_VIRTUAL, cl, meth);
+  Value* Meth = 0;
+
+  if (meth) {
+    Meth = TheCompiler->getMethodInClass(meth);
+  } else {
+    Meth = getConstantPoolAt(index, module->InterfaceLookupFunction,
+                             module->JavaMethodType, 0, false);
+  }
+
+  BasicBlock* label_bb = createBasicBlock("bb");
+  BasicBlock* label_bb4 = createBasicBlock("bb4");
+  BasicBlock* label_bb6 = createBasicBlock("bb6");
+  BasicBlock* label_bb7 = createBasicBlock("bb7");
+    
+  // Block entry (label_entry)
+  Value* VT = CallInst::Create(module->GetVTFunction, args[0], "",
+                               currentBlock);
+  Value* IMT = CallInst::Create(module->GetIMTFunction, VT, "",
+                                currentBlock);
+
+  uint32_t tableIndex = InterfaceMethodTable::getIndex(name, signature->keyName);
+  Constant* Index = ConstantInt::get(Type::getInt32Ty(getGlobalContext()),
+                                     tableIndex);
+
+  Value* indices[2] = { module->constantZero, Index };
+  Instruction* ptr_18 = GetElementPtrInst::Create(IMT, indices, indices + 2, "",
+                                                  currentBlock);
+  Instruction* int32_19 = new LoadInst(ptr_18, "", false, currentBlock);
+  int32_19 = new PtrToIntInst(int32_19, module->pointerSizeType, "",
+                              currentBlock);
+  Value* one = ConstantInt::get(module->pointerSizeType, 1);
+  Value* zero = ConstantInt::get(module->pointerSizeType, 0);
+  BinaryOperator* int32_20 = BinaryOperator::Create(Instruction::And, int32_19,
+                                                    one, "", currentBlock);
+  ICmpInst* int1_toBool = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ,
+                                       int32_20, zero, "toBool");
+  BranchInst::Create(label_bb, label_bb4, int1_toBool, currentBlock);
+    
+  // Block bb (label_bb)
+  currentBlock = label_bb;
+  CastInst* ptr_22 = new IntToPtrInst(int32_19, virtualPtrType, "", currentBlock);
+  Value* ret = invoke(ptr_22, args, "", currentBlock);
+  if (node) node->addIncoming(ret, currentBlock);
+  BranchInst::Create(endBlock, currentBlock);
+    
+  // Block bb4 (label_bb4)
+  currentBlock = label_bb4;
+  Constant* MinusTwo = ConstantInt::get(module->pointerSizeType, -2);
+  BinaryOperator* int32_25 = BinaryOperator::Create(Instruction::And, int32_19,
+                                                    MinusTwo, "", currentBlock);
+  const PointerType* Ty = PointerType::getUnqual(module->JavaMethodType);
+  CastInst* ptr_26 = new IntToPtrInst(int32_25, Ty, "", currentBlock);
+  LoadInst* int32_27 = new LoadInst(ptr_26, "", false, currentBlock);
+  ICmpInst* int1_28 = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, int32_27,
+                                   Meth, "");
+  BranchInst::Create(label_bb6, label_bb7, int1_28, currentBlock);
+    
+  // Block bb6 (label_bb6)
+  currentBlock = label_bb6;
+  PHINode* ptr_table_0_lcssa = PHINode::Create(Ty, "table.0.lcssa",
+                                               currentBlock);
+  ptr_table_0_lcssa->reserveOperandSpace(2);
+  ptr_table_0_lcssa->addIncoming(ptr_26, label_bb4);
+   
+  GetElementPtrInst* ptr_31 = GetElementPtrInst::Create(ptr_table_0_lcssa,
+                                                        module->constantOne, "",
+                                                        currentBlock);
+
+  LoadInst* int32_32 = new LoadInst(ptr_31, "", false, currentBlock);
+  CastInst* ptr_33 = new BitCastInst(int32_32, virtualPtrType, "",
+                                     currentBlock);
+  ret = invoke(ptr_33, args, "", currentBlock);
+  if (node) node->addIncoming(ret, currentBlock);
+  BranchInst::Create(endBlock, currentBlock);
+    
+  // Block bb7 (label_bb7)
+  currentBlock = label_bb7;
+  PHINode* int32_indvar = PHINode::Create(Type::getInt32Ty(*llvmContext),
+                                          "indvar", currentBlock);
+  int32_indvar->reserveOperandSpace(2);
+  int32_indvar->addIncoming(module->constantZero, label_bb4);
+    
+  BinaryOperator* int32_table_010_rec =
+    BinaryOperator::Create(Instruction::Shl, int32_indvar, module->constantOne,
+                           "table.010.rec", currentBlock);
+
+  BinaryOperator* int32__rec =
+    BinaryOperator::Create(Instruction::Add, int32_table_010_rec,
+                           module->constantTwo, ".rec", currentBlock);
+  GetElementPtrInst* ptr_37 = GetElementPtrInst::Create(ptr_26, int32__rec, "",
+                                                        currentBlock);
+  LoadInst* int32_38 = new LoadInst(ptr_37, "", false, currentBlock);
+  ICmpInst* int1_39 = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, int32_38,
+                                   Meth, "");
+  BinaryOperator* int32_indvar_next =
+    BinaryOperator::Create(Instruction::Add, int32_indvar, module->constantOne,
+                           "indvar.next", currentBlock);
+  BranchInst::Create(label_bb6, label_bb7, int1_39, currentBlock);
+  
+  int32_indvar->addIncoming(int32_indvar_next, currentBlock);
+  ptr_table_0_lcssa->addIncoming(ptr_37, currentBlock);
+      
+#endif
   currentBlock = endBlock;
   if (node) {
     if (node->getType() == module->JavaObjectType) {

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp Tue Dec  8 10:54:05 2009
@@ -262,6 +262,48 @@
 
 }
 
+void JavaJITCompiler::makeIMT(Class* cl) {
+  InterfaceMethodTable* IMT = cl->virtualVT->IMT;
+  if (!IMT) return;
+ 
+  std::vector<JavaMethod*> contents[InterfaceMethodTable::NumIndexes];
+  cl->fillIMT(contents);
+  
+  ExecutionEngine* EE = mvm::MvmModule::executionEngine;
+  
+  for (uint32_t i = 0; i < InterfaceMethodTable::NumIndexes; ++i) {
+    std::vector<JavaMethod*>& atIndex = contents[i];
+    uint32_t size = atIndex.size();
+    if (size == 1) {
+      JavaMethod* meth = cl->lookupMethodDontThrow(atIndex[0]->name,
+                                                   atIndex[0]->type,
+                                                   false, true, 0);
+      LLVMMethodInfo* LMI = getMethodInfo(meth);
+      Function* func = LMI->getMethod();
+      uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+      IMT->contents[i] = res;
+    } else if (size > 1) {
+      uint32_t length = 2 * size * sizeof(uintptr_t);
+      
+      uintptr_t* table = (uintptr_t*)
+        cl->classLoader->allocator.Allocate(length, "IMT");
+      
+      IMT->contents[i] = (uintptr_t)table | 1;
+
+      for (uint32_t j = 0; j < size; ++j) {
+        JavaMethod* Imeth = atIndex[j];
+        JavaMethod* Cmeth = cl->lookupMethodDontThrow(Imeth->name, Imeth->type,
+                                                      false, true, 0);
+        LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+        Function* func = LMI->getMethod();
+        uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+        table[j << 1] = (uintptr_t)Imeth;
+        table[(j << 1) + 1] = res;
+      }
+    }
+  }
+}
+
 void JavaJITCompiler::setMethod(JavaMethod* meth, void* ptr, const char* name) {
   Function* func = getMethodInfo(meth)->getMethod();
   func->setName(name);

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Tue Dec  8 10:54:05 2009
@@ -199,6 +199,8 @@
   OffsetDisplayInVTConstant = constantSeven;
   OffsetBaseClassVTInVTConstant =
     ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 17);
+  OffsetIMTInVTConstant =
+    ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 18);
   
   OffsetAccessInCommonClassConstant = constantOne;
   IsArrayConstant = ConstantInt::get(Type::getInt16Ty(getGlobalContext()),
@@ -264,6 +266,7 @@
   GetConstantPoolAtFunction = module->getFunction("getConstantPoolAt");
   ArrayLengthFunction = module->getFunction("arrayLength");
   GetVTFunction = module->getFunction("getVT");
+  GetIMTFunction = module->getFunction("getIMT");
   GetClassFunction = module->getFunction("getClass");
   ClassLookupFunction = module->getFunction("jnjvmClassLookup");
   GetVTFromClassFunction = module->getFunction("getVTFromClass");

Modified: vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp Tue Dec  8 10:54:05 2009
@@ -224,6 +224,17 @@
           Value* VT = new LoadInst(VTPtr, "", CI);
           CI->replaceAllUsesWith(VT);
           CI->eraseFromParent();
+        } else if (V == module->GetIMTFunction) {
+          Changed = true;
+          Value* val = Call.getArgument(0); // get the VT
+          Value* indexes[2] = { module->constantZero,
+                                module->OffsetIMTInVTConstant };
+          Value* IMTPtr = GetElementPtrInst::Create(val, indexes, indexes + 2,
+                                                    "", CI);
+          Value* IMT = new LoadInst(IMTPtr, "", CI);
+          IMT = new BitCastInst(IMT, CI->getType(), "", CI);
+          CI->replaceAllUsesWith(IMT);
+          CI->eraseFromParent();
         } else if (V == module->GetClassFunction) {
           Changed = true;
           Value* val = Call.getArgument(0); // get the object

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Tue Dec  8 10:54:05 2009
@@ -64,6 +64,9 @@
 ;;; getVT - Get the VT of the object.
 declare %VT* @getVT(%JavaObject*) readnone 
 
+;;; getIMT - Get the IMT of the VT.
+declare %VT* @getIMT(%VT*) readnone 
+
 ;;; getClass - Get the class of an object.
 declare %JavaCommonClass* @getClass(%JavaObject*) readnone 
 
@@ -107,7 +110,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;; jnjvmInterfaceLookup - Used for interface calls.
-declare i8* @jnjvmInterfaceLookup(%CacheNode*, %JavaObject*)
+declare i8* @jnjvmInterfaceLookup(%JavaClass*, i32, ...)
 
 ;;; jnjvmMultiCallNew - Allocate multi-dimensional arrays. This will go to
 ;;; allocation specific methods.

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Tue Dec  8 10:54:05 2009
@@ -772,6 +772,22 @@
   }
 }
 
+void Class::fillIMT(std::vector<JavaMethod*>* meths) {
+  for (uint32 i = 0; i < nbInterfaces; ++i) {
+    interfaces[i]->fillIMT(meths);
+  }
+
+  if (super) super->fillIMT(meths);
+
+  if (isInterface()) {
+    for (uint32 i = 0; i < nbVirtualMethods; ++i) {
+      JavaMethod& meth = virtualMethods[i];
+      uint32_t index = InterfaceMethodTable::getIndex(meth.name, meth.type);
+      meths[index].push_back(&meth);
+    }
+  }
+}
+
 void Class::makeVT() {
   
   for (uint32 i = 0; i < nbVirtualMethods; ++i) {
@@ -1377,6 +1393,10 @@
     destructor = 0;
     operatorDelete = 0;
     
+    // Set IMT.
+    if (!isAbstract(C->access))
+      IMT = new (C->classLoader->allocator, "IMT") InterfaceMethodTable();
+    
     // Set the class of this VT.
     cl = C;
     
@@ -1439,7 +1459,7 @@
     }
 
   } else {
-    // Set the tracer, destructor and delete
+    // Set the tracer, destructor and delete.
     tracer = (uintptr_t)JavaObjectTracer;
     destructor = 0;
     operatorDelete = 0;

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Tue Dec  8 10:54:05 2009
@@ -915,6 +915,11 @@
   ///
   bool needsInitialisationCheck();
 
+  /// fillIMT - Fill the vector with vectors of methods with the same IMT
+  /// index.
+  ///
+  void fillIMT(std::vector<JavaMethod*>* meths);
+
 private:
 
   /// makeVT - Create the virtual table of this class.

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h Tue Dec  8 10:54:05 2009
@@ -10,7 +10,9 @@
 #ifndef JNJVM_JAVA_OBJECT_H
 #define JNJVM_JAVA_OBJECT_H
 
+#include "mvm/Allocator.h"
 #include "mvm/Object.h"
+#include "mvm/UTF8.h"
 #include "mvm/Threads/Locks.h"
 #include "mvm/Threads/Thread.h"
 
@@ -27,6 +29,16 @@
 class Typedef;
 class UserCommonClass;
 
+class InterfaceMethodTable : public mvm::PermanentObject {
+public:
+	static const uint32_t NumIndexes = 29;
+	uintptr_t contents[NumIndexes];
+
+  static uint32_t getIndex(const mvm::UTF8* name, const mvm::UTF8* type) {
+    return (name->hash() + type->hash()) % NumIndexes;
+  }
+};
+
 /// JavaVirtualTable - This class is the virtual table of instances of
 /// Java classes. Besides holding function pointers for virtual calls,
 /// it contains a bunch of information useful for fast dynamic type checking.
@@ -72,6 +84,10 @@
   ///
   JavaVirtualTable* baseClassVT;
 
+  /// IMT - The interface method table.
+  ///
+  InterfaceMethodTable* IMT;
+
   /// Java methods for the virtual table functions.
   uintptr_t init;
   uintptr_t equals;
@@ -113,13 +129,13 @@
   /// getFirstJavaMethodIndex - Get the word offset of the first Java method.
   ///
   static uint32_t getFirstJavaMethodIndex() {
-    return 18;
+    return 19;
   }
    
   /// getBaseSize - Get the size of the java.lang.Object virtual table.
   ///
   static uint32_t getBaseSize() {
-    return 29;
+    return 30;
   }
   
   /// getNumJavaMethods - Get the number of methods of the java.lang.Object

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Tue Dec  8 10:54:05 2009
@@ -25,6 +25,7 @@
 
 using namespace jnjvm;
 
+#if 0
 // Throws if the method is not found.
 extern "C" void* jnjvmInterfaceLookup(CacheNode* cache, JavaObject *obj) {
 
@@ -107,6 +108,40 @@
 
   return res; 
 }
+#endif
+
+extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index) {
+
+  void* res = 0;
+
+  BEGIN_NATIVE_EXCEPTION(1)
+  
+  UserConstantPool* ctpInfo = caller->getConstantPool();
+  if (ctpInfo->ctpRes[index]) {
+    res = ctpInfo->ctpRes[index];
+  } else {
+    UserCommonClass* cl = 0;
+    const UTF8* utf8 = 0;
+    Signdef* sign = 0;
+  
+    ctpInfo->resolveMethod(index, cl, utf8, sign);
+    assert(cl->isClass() && isInterface(cl->access) && "Wrong type of method");
+    res = cl->asClass()->lookupInterfaceMethodDontThrow(utf8, sign->keyName);
+    
+    assert(res && "Can not found method");
+    ctpInfo->ctpRes[index] = (void*)res;
+  }
+  
+    
+  END_NATIVE_EXCEPTION
+
+  // Since the function is marked readnone, LLVM may move it after the
+  // exception check. Therefore, we trick LLVM to check the return value of the
+  // function.
+  JavaObject* obj = JavaThread::get()->pendingException;
+  if (obj) return (JavaMethod*)obj;
+  return res;
+}
 
 // Throws if the field is not found.
 extern "C" void* jnjvmVirtualFieldLookup(UserClass* caller, uint32 index) {

Modified: vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp?rev=90861&r1=90860&r2=90861&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp Tue Dec  8 10:54:05 2009
@@ -29,7 +29,7 @@
   return (r1 & 255) + ((r0 & 255) << 8);
 }
 
-static uint32 readerHasher(const uint16* buf, sint32 size) {
+uint32 UTF8::readerHasher(const uint16* buf, sint32 size) {
   uint32 r0 = 0, r1 = 0;
   for (sint32 i = 0; i < size; i++) {
     uint16 c = buf[i];
@@ -58,7 +58,7 @@
 
 void UTF8Map::replace(const UTF8* oldUTF8, const UTF8* newUTF8) {
   lock.lock();
-  uint32 key = readerHasher(oldUTF8->elements, oldUTF8->size);
+  uint32 key = oldUTF8->hash();
   std::pair<UTF8Map::iterator, UTF8Map::iterator> p = map.equal_range(key);
   
   for (UTF8Map::iterator i = p.first; i != p.second; i++) {
@@ -102,7 +102,7 @@
 
 const UTF8* UTF8Map::lookupOrCreateReader(const uint16* buf, uint32 len) {
   sint32 size = (sint32)len;
-  uint32 key = readerHasher(buf, size);
+  uint32 key = UTF8::readerHasher(buf, size);
   const UTF8* res = 0;
   lock.lock();
   
@@ -147,7 +147,7 @@
 
 const UTF8* UTF8Map::lookupReader(const uint16* buf, uint32 len) {
   sint32 size = (sint32)len;
-  uint32 key = readerHasher(buf, size);
+  uint32 key = UTF8::readerHasher(buf, size);
   const UTF8* res = 0;
   lock.lock();
   
@@ -165,5 +165,5 @@
 }
 
 void UTF8Map::insert(const UTF8* val) {
-  map.insert(std::make_pair(readerHasher(val->elements, val->size), val));
+  map.insert(std::make_pair(val->hash(), val));
 }




From nicolas.geoffray at lip6.fr  Sun Dec 13 12:07:28 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Sun, 13 Dec 2009 20:07:28 -0000
Subject: [vmkit-commits] [vmkit] r91248 - in /vmkit/trunk:
 include/jnjvm/JnjvmModule.h lib/JnJVM/Compiler/JavaAOTCompiler.cpp
 lib/JnJVM/Compiler/JnjvmModule.cpp
Message-ID: <200912132007.nBDK7SbZ009698@zion.cs.uiuc.edu>

Author: geoffray
Date: Sun Dec 13 14:07:28 2009
New Revision: 91248

URL: http://llvm.org/viewvc/llvm-project?rev=91248&view=rev
Log:
Support AOT for the new interface call implementation.


Modified:
    vmkit/trunk/include/jnjvm/JnjvmModule.h
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp

Modified: vmkit/trunk/include/jnjvm/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/jnjvm/JnjvmModule.h?rev=91248&r1=91247&r2=91248&view=diff

==============================================================================
--- vmkit/trunk/include/jnjvm/JnjvmModule.h (original)
+++ vmkit/trunk/include/jnjvm/JnjvmModule.h Sun Dec 13 14:07:28 2009
@@ -330,6 +330,7 @@
   llvm::Constant* OffsetObjectSizeInClassConstant;
   llvm::Constant* OffsetVTInClassConstant;
   llvm::Constant* OffsetTaskClassMirrorInClassConstant;
+  llvm::Constant* OffsetVirtualMethodsInClassConstant;
   llvm::Constant* OffsetStaticInstanceInTaskClassMirrorConstant;
   llvm::Constant* OffsetInitializedInTaskClassMirrorConstant;
   llvm::Constant* OffsetStatusInTaskClassMirrorConstant;

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=91248&r1=91247&r2=91248&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Sun Dec 13 14:07:28 2009
@@ -14,6 +14,7 @@
 #include "llvm/Module.h"
 #include "llvm/ModuleProvider.h"
 #include "llvm/PassManager.h"
+#include "llvm/Support/raw_ostream.h"
 
 #include "mvm/Threads/Thread.h"
 
@@ -135,14 +136,32 @@
   Class* cl = meth->classDef;
   Constant* MOffset = 0;
   Constant* Array = 0;
-  method_iterator SI = virtualMethods.find(cl);
+
   for (uint32 i = 0; i < cl->nbVirtualMethods + cl->nbStaticMethods; ++i) {
     if (&cl->virtualMethods[i] == meth) {
       MOffset = ConstantInt::get(Type::getInt32Ty(getGlobalContext()), i);
       break;
     }
   }
-  Array = SI->second; 
+  assert(MOffset && "No offset for method");
+
+  method_iterator SI = virtualMethods.find(cl);
+  if (SI != virtualMethods.end()) {
+    Array = SI->second; 
+    assert(Array && "No array in class");
+  } else {
+    std::string name(UTF8Buffer(cl->name).toCompileName()->cString());
+    name += "_VirtualMethods";
+    Module& Mod = *getLLVMModule();
+    const Type* ATy =
+      ArrayType::get(JnjvmModule::JavaMethodType->getContainedType(0),
+                     cl->nbVirtualMethods + cl->nbStaticMethods);
+
+    Array = new GlobalVariable(Mod, ATy, false, GlobalValue::ExternalLinkage,
+                               0, name);
+    virtualMethods.insert(std::make_pair(cl, Array));
+  }
+    
   Constant* GEPs[2] = { getIntrinsics()->constantZero, MOffset };
   return ConstantExpr::getGetElementPtr(Array, GEPs, 2);
 }
@@ -1162,9 +1181,11 @@
   if (cl->nbVirtualMethods + cl->nbStaticMethods) {
     methods = ConstantArray::get(ATy, TempElts);
     TempElts.clear();
+    std::string name(UTF8Buffer(cl->name).toCompileName()->cString());
+    name += "_VirtualMethods";
     GlobalVariable* GV = new GlobalVariable(Mod, ATy, false,
-                                            GlobalValue::InternalLinkage,
-                                            methods, "");
+                                            GlobalValue::ExternalLinkage,
+                                            methods, name);
     virtualMethods.insert(std::make_pair(cl, GV));
     methods = ConstantExpr::getCast(Instruction::BitCast, GV,
                                     JnjvmModule::JavaMethodType);
@@ -1502,9 +1523,77 @@
   } else {
     Elemts.push_back(Constant::getNullValue(PTy));
   }
+   
+  // IMT
+  if (!VT->IMT) {
+    Elemts.push_back(Constant::getNullValue(PTy));
+  } else {
+    Class* cl = classDef->asClass();
+    assert(cl && "Not a class");
+    std::vector<JavaMethod*> contents[InterfaceMethodTable::NumIndexes];
+    classDef->asClass()->fillIMT(contents);
+  
+
+    const ArrayType* ATy = 
+      dyn_cast<ArrayType>(JnjvmModule::VTType->getContainedType(0));
+    const PointerType* PTy = dyn_cast<PointerType>(ATy->getContainedType(0));
+    ATy = ArrayType::get(PTy, InterfaceMethodTable::NumIndexes);
+  
+    ConstantPointerNull* N = ConstantPointerNull::get(PTy);
+    std::vector<Constant*> IElemts;
+
+    for (uint32_t i = 0; i < InterfaceMethodTable::NumIndexes; ++i) {
+      std::vector<JavaMethod*>& atIndex = contents[i];
+      uint32_t size = atIndex.size();
+      if (size == 1) {
+        JavaMethod* meth = cl->lookupMethodDontThrow(atIndex[0]->name,
+                                                     atIndex[0]->type,
+                                                     false, true, 0);
+        LLVMMethodInfo* LMI = getMethodInfo(meth);
+        Function* func = LMI->getMethod();
+        IElemts.push_back(ConstantExpr::getBitCast(func, PTy));
+      } else if (size > 1) {
+        uint32_t length = 2 * size;
+        
+        const ArrayType* ATy = 
+          dyn_cast<ArrayType>(JnjvmModule::VTType->getContainedType(0));
+        ATy = ArrayType::get(PTy, length);
+        std::vector<Constant*> InternalElemts;
+     
+
+        for (uint32_t j = 0; j < size; ++j) {
+          JavaMethod* Imeth = atIndex[j];
+          JavaMethod* Cmeth = cl->lookupMethodDontThrow(Imeth->name,
+                                                        Imeth->type,
+                                                        false, true, 0);
+          LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+          Function* func = LMI->getMethod();
+          InternalElemts.push_back(
+            ConstantExpr::getBitCast(getMethodInClass(Imeth), PTy));
+          InternalElemts.push_back(ConstantExpr::getBitCast(func, PTy));
+        }
+        Constant* Array = ConstantArray::get(ATy, InternalElemts);
     
-  // TODO: IMT
-  Elemts.push_back(Constant::getNullValue(PTy));
+        GlobalVariable* GV = new GlobalVariable(*getLLVMModule(), ATy, false,
+                                                GlobalValue::InternalLinkage,
+                                              Array, "");
+     
+        Constant* CI =
+          ConstantExpr::getPtrToInt(GV, Type::getInt32Ty(getGlobalContext()));
+        CI = ConstantExpr::getOr(CI, JavaIntrinsics.constantOne);
+        CI = ConstantExpr::getIntToPtr(CI, PTy);
+        IElemts.push_back(CI);
+      } else {
+        IElemts.push_back(N);
+      }
+    }
+ 
+    Constant* Array = ConstantArray::get(ATy, IElemts);
+    GlobalVariable* GV = new GlobalVariable(*getLLVMModule(), ATy, false,
+                                            GlobalValue::InternalLinkage,
+                                            Array, "");
+    Elemts.push_back(ConstantExpr::getBitCast(GV, PTy));
+  }
  
   // methods
   for (uint32 i = JavaVirtualTable::getFirstJavaMethodIndex(); i < size; ++i) {

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=91248&r1=91247&r2=91248&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Sun Dec 13 14:07:28 2009
@@ -216,6 +216,8 @@
   OffsetVTInClassConstant =
     ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 7);
   OffsetTaskClassMirrorInClassConstant = constantThree;
+  OffsetVirtualMethodsInClassConstant =
+    ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 9);
   OffsetStaticInstanceInTaskClassMirrorConstant = constantThree;
   OffsetStatusInTaskClassMirrorConstant = constantZero;
   OffsetInitializedInTaskClassMirrorConstant = constantOne;




From nicolas.geoffray at lip6.fr  Mon Dec 14 13:18:35 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Mon, 14 Dec 2009 21:18:35 -0000
Subject: [vmkit-commits] [vmkit] r91328 - in /vmkit/trunk/www:
 UsersManual.html menu.html.incl use_aot.html
Message-ID: <200912142118.nBELIZGg016800@zion.cs.uiuc.edu>

Author: geoffray
Date: Mon Dec 14 15:18:34 2009
New Revision: 91328

URL: http://llvm.org/viewvc/llvm-project?rev=91328&view=rev
Log:
Document AOT.


Added:
    vmkit/trunk/www/UsersManual.html
    vmkit/trunk/www/use_aot.html
Modified:
    vmkit/trunk/www/menu.html.incl

Added: vmkit/trunk/www/UsersManual.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/UsersManual.html?rev=91328&view=auto

==============================================================================
--- vmkit/trunk/www/UsersManual.html (added)
+++ vmkit/trunk/www/UsersManual.html Mon Dec 14 15:18:34 2009
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+          "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+  <title>VMKit - Getting Started</title>
+  <link type="text/css" rel="stylesheet" href="menu.css" />
+  <link type="text/css" rel="stylesheet" href="content.css" />
+</head>
+<body>
+
+<!--#include virtual="menu.html.incl"-->
+
+<div id="content">
+
+<h1>VMKit User's Manual</h1>
+
+<ul>
+  <li><a href="/use_aot.html">Java Ahead of Time (AOT) Compilation</a></li>
+</li>
+

Modified: vmkit/trunk/www/menu.html.incl
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/menu.html.incl?rev=91328&r1=91327&r2=91328&view=diff

==============================================================================
--- vmkit/trunk/www/menu.html.incl (original)
+++ vmkit/trunk/www/menu.html.incl Mon Dec 14 15:18:34 2009
@@ -8,6 +8,7 @@
     <a href="/index.html">About</a>
     <a href="/get_started.html">Get&nbsp;Started</a>
     <a href="/get_involved.html">Get&nbsp;Involved</a>
+    <a href="/UsersManual.html">Users&nbsp;Manual</a>
     <a href="/OpenProjects.html">Open&nbsp;Projects</a>
     <a href="/pubs.html">Publications</a>
     <a href="/releases/index.html">Releases</a>

Added: vmkit/trunk/www/use_aot.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/use_aot.html?rev=91328&view=auto

==============================================================================
--- vmkit/trunk/www/use_aot.html (added)
+++ vmkit/trunk/www/use_aot.html Mon Dec 14 15:18:34 2009
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+          "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+  <title>VMKit - Getting Started</title>
+  <link type="text/css" rel="stylesheet" href="menu.css" />
+  <link type="text/css" rel="stylesheet" href="content.css" />
+</head>
+<body>
+
+<!--#include virtual="menu.html.incl"-->
+
+<div id="content">
+
+<h1>Getting Started: Java Ahead of Time compilation with VMKit</h1>
+
+
+<p>This page gives you the instructions on how to use the Java ahead of time
+compiler of VMKit.</p>
+
+
+<ol>
+  <li><a href="/get_started.html">Checkout
+   and build VMKit</a> from SVN head.</li>
+
+ <li>Compile into a dynamic library the core Java libs (e.g. GNU Classpath):
+ </li>
+
+  <ul>
+    <li><tt>cd tools/vmjc/libvmjc</tt></li>
+    <li><tt>make ENABLE_OPTIMIZED=1 REQUIRES_FRAME_POINTER=1
+      (go get coffee)</tt></li>
+  </ul>
+  
+  <li>Update PATH to include LLVM and VMKit binaries (replace *_OBJ with your
+      directory):</li>
+   <ul>
+     <li><tt>export PATH=$(LLVM_OBJ)/Release/bin:$(VMKIT_OBJ)/Release/bin
+     </tt></li>
+   </ul>
+   
+   <li>Update LD_LIBRARY_PATH to include the dynamic library previously
+       compiled (replace VMKIT_OBJ with your directory):</li>
+   <ul>
+     <li><tt>export LD_LIBRARY_PATH=$(VMKIT_OBJ)/Release/lib
+     </tt></li>
+   </ul>
+  
+   <li>Use the <tt>llcj</tt> tool on a class or a jar file:</li>
+   <ul>
+     <li><tt>llcj -S Foo.class (emit bytecode)</tt></li>
+     <li><tt>llcj --main=Foo Foo.class (generate an executable)</tt></li>
+     <li><tt>llcj -c Foo.class (generate an object file)</tt></li>
+   </ul>
+
+</ol>
+
+</div>
+</body>
+</html>




From nicolas.geoffray at lip6.fr  Mon Dec 14 13:32:22 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Mon, 14 Dec 2009 21:32:22 -0000
Subject: [vmkit-commits] [vmkit] r91332 - in /vmkit/trunk/www:
	UsersManual.html use_mmtk.html
Message-ID: <200912142132.nBELWM4B017446@zion.cs.uiuc.edu>

Author: geoffray
Date: Mon Dec 14 15:32:21 2009
New Revision: 91332

URL: http://llvm.org/viewvc/llvm-project?rev=91332&view=rev
Log:
Add information on how to build with MMTk.


Added:
    vmkit/trunk/www/use_mmtk.html
Modified:
    vmkit/trunk/www/UsersManual.html

Modified: vmkit/trunk/www/UsersManual.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/UsersManual.html?rev=91332&r1=91331&r2=91332&view=diff

==============================================================================
--- vmkit/trunk/www/UsersManual.html (original)
+++ vmkit/trunk/www/UsersManual.html Mon Dec 14 15:32:21 2009
@@ -17,5 +17,6 @@
 
 <ul>
   <li><a href="/use_aot.html">Java Ahead of Time (AOT) Compilation</a></li>
+  <li><a href="/use_mmtk.html">VMKit and MMTk</a></li>
 </li>
 

Added: vmkit/trunk/www/use_mmtk.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/use_mmtk.html?rev=91332&view=auto

==============================================================================
--- vmkit/trunk/www/use_mmtk.html (added)
+++ vmkit/trunk/www/use_mmtk.html Mon Dec 14 15:32:21 2009
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+          "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+  <title>VMKit - Getting Started</title>
+  <link type="text/css" rel="stylesheet" href="menu.css" />
+  <link type="text/css" rel="stylesheet" href="content.css" />
+</head>
+<body>
+
+<!--#include virtual="menu.html.incl"-->
+
+<div id="content">
+
+<h1>Getting Started: VMKit and MMTk</h1>
+
+
+<p>This page gives you the instructions on how to build VMKit with MMTk's Mark and
+Sweep Garbage Collector.</p>
+
+
+<ol>
+  <li><a href="http://www.llvm.org/docs/GCCFEBuildInstrs.html">Checkout
+    and build LLVM-GCC</a> from SVN head.</li>
+  <li> Update PATH to include the <tt>llvm-gcc</tt> binary. </li>
+  <li> Re-configure LLVM. </li>
+  <li> Make sure to build LLVM with REQUIRES_FRAME_POINTER=1.</li>
+  <li> Configure VMKit with two additional options: <tt>--with-gc=mmtk</tt> and <tt>--with-llvmgcc</tt>. </li>
+  <li> Clean and make VMKit (do that each time you change the source code of VMKit):</li>
+
+  <ul>
+    <li><tt>make ENABLE_OPTIMIZED=1 REQUIRES_FRAME_POINTER=1 clean </tt></li>
+    <li><tt>make ENABLE_OPTIMIZED=1 REQUIRES_FRAME_POINTER=1 </tt></li>
+  </ul>
+  
+  <li>Run VMKit with MMTk:</li>
+   <ul>
+     <li><tt>Release/bin/vmkit -std-compile-opts --load-bc=Release/lib/FinalMMTk.bc
+             -load-bc=lib/JnJVM/LLVMRuntime/LLVMRuntime.gen.ll -java Foo </tt></li>
+   </ul>
+
+</ol>
+
+</div>
+</body>
+</html>




From nicolas.geoffray at lip6.fr  Tue Dec 15 12:12:41 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Tue, 15 Dec 2009 20:12:41 -0000
Subject: [vmkit-commits] [vmkit] r91445 -
	/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
Message-ID: <200912152012.nBFKCfwb017468@zion.cs.uiuc.edu>

Author: geoffray
Date: Tue Dec 15 14:12:41 2009
New Revision: 91445

URL: http://llvm.org/viewvc/llvm-project?rev=91445&view=rev
Log:
Use Add instead of Or becode the assembler does not seem to like '|'.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=91445&r1=91444&r2=91445&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Tue Dec 15 14:12:41 2009
@@ -1580,7 +1580,7 @@
      
         Constant* CI =
           ConstantExpr::getPtrToInt(GV, Type::getInt32Ty(getGlobalContext()));
-        CI = ConstantExpr::getOr(CI, JavaIntrinsics.constantOne);
+        CI = ConstantExpr::getAdd(CI, JavaIntrinsics.constantOne);
         CI = ConstantExpr::getIntToPtr(CI, PTy);
         IElemts.push_back(CI);
       } else {




From nicolas.geoffray at lip6.fr  Tue Dec 15 12:19:41 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Tue, 15 Dec 2009 20:19:41 -0000
Subject: [vmkit-commits] [vmkit] r91447 - in /vmkit/trunk/lib/JnJVM:
 Compiler/JavaAOTCompiler.cpp Compiler/JavaJITCompiler.cpp
 VMCore/JavaClass.cpp VMCore/JavaClass.h
Message-ID: <200912152019.nBFKJfCs019623@zion.cs.uiuc.edu>

Author: geoffray
Date: Tue Dec 15 14:19:41 2009
New Revision: 91447

URL: http://llvm.org/viewvc/llvm-project?rev=91447&view=rev
Log:
Optimize IMT by avoiding duplicates in IMT entries.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=91447&r1=91446&r2=91447&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Tue Dec 15 14:19:41 2009
@@ -1530,7 +1530,7 @@
   } else {
     Class* cl = classDef->asClass();
     assert(cl && "Not a class");
-    std::vector<JavaMethod*> contents[InterfaceMethodTable::NumIndexes];
+    std::set<JavaMethod*> contents[InterfaceMethodTable::NumIndexes];
     classDef->asClass()->fillIMT(contents);
   
 
@@ -1543,46 +1543,71 @@
     std::vector<Constant*> IElemts;
 
     for (uint32_t i = 0; i < InterfaceMethodTable::NumIndexes; ++i) {
-      std::vector<JavaMethod*>& atIndex = contents[i];
+      std::set<JavaMethod*>& atIndex = contents[i];
       uint32_t size = atIndex.size();
       if (size == 1) {
-        JavaMethod* meth = cl->lookupMethodDontThrow(atIndex[0]->name,
-                                                     atIndex[0]->type,
+        JavaMethod* Imeth = *(atIndex.begin());
+        JavaMethod* meth = cl->lookupMethodDontThrow(Imeth->name,
+                                                     Imeth->type,
                                                      false, true, 0);
         LLVMMethodInfo* LMI = getMethodInfo(meth);
         Function* func = LMI->getMethod();
         IElemts.push_back(ConstantExpr::getBitCast(func, PTy));
       } else if (size > 1) {
-        uint32_t length = 2 * size;
+        std::vector<JavaMethod*> methods;
+        bool SameMethod = true;
+        JavaMethod* OldMethod = 0;
+      
+        for (std::set<JavaMethod*>::iterator it = atIndex.begin(),
+             et = atIndex.end(); it != et; ++it) {
+          JavaMethod* Imeth = *it;
+          JavaMethod* Cmeth = cl->lookupMethodDontThrow(Imeth->name, Imeth->type,
+                                                      false, true, 0);
+       
+          if (OldMethod && OldMethod != Cmeth) SameMethod = false;
+          else OldMethod = Cmeth;
         
-        const ArrayType* ATy = 
-          dyn_cast<ArrayType>(JnjvmModule::VTType->getContainedType(0));
-        ATy = ArrayType::get(PTy, length);
-        std::vector<Constant*> InternalElemts;
-     
+          methods.push_back(Cmeth);
+        }
 
-        for (uint32_t j = 0; j < size; ++j) {
-          JavaMethod* Imeth = atIndex[j];
-          JavaMethod* Cmeth = cl->lookupMethodDontThrow(Imeth->name,
-                                                        Imeth->type,
-                                                        false, true, 0);
-          LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+        if (SameMethod) {
+          LLVMMethodInfo* LMI = getMethodInfo(methods[0]);
           Function* func = LMI->getMethod();
-          InternalElemts.push_back(
-            ConstantExpr::getBitCast(getMethodInClass(Imeth), PTy));
-          InternalElemts.push_back(ConstantExpr::getBitCast(func, PTy));
-        }
-        Constant* Array = ConstantArray::get(ATy, InternalElemts);
+          IElemts.push_back(ConstantExpr::getBitCast(func, PTy));
+        } else {
+
+          uint32_t length = 2 * size;
+        
+          const ArrayType* ATy = 
+            dyn_cast<ArrayType>(JnjvmModule::VTType->getContainedType(0));
+          ATy = ArrayType::get(PTy, length);
+          std::vector<Constant*> InternalElemts;
+     
+
+          std::set<JavaMethod*>::iterator Interf = atIndex.begin();
+          for (std::vector<JavaMethod*>::iterator it = methods.begin(),
+               et = methods.end(); it != et; ++it, ++Interf) {
+            JavaMethod* Imeth = *Interf;
+            JavaMethod* Cmeth = *it;
+
+            LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+            Function* func = LMI->getMethod();
+            InternalElemts.push_back(
+              ConstantExpr::getBitCast(getMethodInClass(Imeth), PTy));
+            InternalElemts.push_back(ConstantExpr::getBitCast(func, PTy));
+          }
+          Constant* Array = ConstantArray::get(ATy, InternalElemts);
     
-        GlobalVariable* GV = new GlobalVariable(*getLLVMModule(), ATy, false,
-                                                GlobalValue::InternalLinkage,
-                                              Array, "");
+          GlobalVariable* GV = new GlobalVariable(*getLLVMModule(), ATy, false,
+                                                  GlobalValue::InternalLinkage,
+                                                  Array, "");
      
-        Constant* CI =
-          ConstantExpr::getPtrToInt(GV, Type::getInt32Ty(getGlobalContext()));
-        CI = ConstantExpr::getAdd(CI, JavaIntrinsics.constantOne);
-        CI = ConstantExpr::getIntToPtr(CI, PTy);
-        IElemts.push_back(CI);
+          Constant* CI =
+            ConstantExpr::getPtrToInt(GV, Type::getInt32Ty(getGlobalContext()));
+          CI = ConstantExpr::getAdd(CI, JavaIntrinsics.constantOne);
+          CI = ConstantExpr::getIntToPtr(CI, PTy);
+          IElemts.push_back(CI);
+        }
       } else {
         IElemts.push_back(N);
       }

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp?rev=91447&r1=91446&r2=91447&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp Tue Dec 15 14:19:41 2009
@@ -266,39 +266,67 @@
   InterfaceMethodTable* IMT = cl->virtualVT->IMT;
   if (!IMT) return;
  
-  std::vector<JavaMethod*> contents[InterfaceMethodTable::NumIndexes];
+  std::set<JavaMethod*> contents[InterfaceMethodTable::NumIndexes];
   cl->fillIMT(contents);
   
   ExecutionEngine* EE = mvm::MvmModule::executionEngine;
   
   for (uint32_t i = 0; i < InterfaceMethodTable::NumIndexes; ++i) {
-    std::vector<JavaMethod*>& atIndex = contents[i];
+    std::set<JavaMethod*>& atIndex = contents[i];
     uint32_t size = atIndex.size();
     if (size == 1) {
-      JavaMethod* meth = cl->lookupMethodDontThrow(atIndex[0]->name,
-                                                   atIndex[0]->type,
+      JavaMethod* Imeth = *(atIndex.begin());
+      JavaMethod* meth = cl->lookupMethodDontThrow(Imeth->name,
+                                                   Imeth->type,
                                                    false, true, 0);
       LLVMMethodInfo* LMI = getMethodInfo(meth);
       Function* func = LMI->getMethod();
       uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
       IMT->contents[i] = res;
     } else if (size > 1) {
-      uint32_t length = 2 * size * sizeof(uintptr_t);
+      std::vector<JavaMethod*> methods;
+      bool SameMethod = true;
+      JavaMethod* OldMethod = 0;
       
-      uintptr_t* table = (uintptr_t*)
-        cl->classLoader->allocator.Allocate(length, "IMT");
-      
-      IMT->contents[i] = (uintptr_t)table | 1;
-
-      for (uint32_t j = 0; j < size; ++j) {
-        JavaMethod* Imeth = atIndex[j];
+      for (std::set<JavaMethod*>::iterator it = atIndex.begin(),
+           et = atIndex.end(); it != et; ++it) {
+        JavaMethod* Imeth = *it;
         JavaMethod* Cmeth = cl->lookupMethodDontThrow(Imeth->name, Imeth->type,
                                                       false, true, 0);
-        LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+       
+        if (OldMethod && OldMethod != Cmeth) SameMethod = false;
+        else OldMethod = Cmeth;
+        
+        methods.push_back(Cmeth);
+      }
+
+      if (SameMethod) {
+        LLVMMethodInfo* LMI = getMethodInfo(methods[0]);
         Function* func = LMI->getMethod();
         uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
-        table[j << 1] = (uintptr_t)Imeth;
-        table[(j << 1) + 1] = res;
+        IMT->contents[i] = res;
+      } else {
+
+        uint32_t length = 2 * size * sizeof(uintptr_t);
+      
+        uintptr_t* table = (uintptr_t*)
+          cl->classLoader->allocator.Allocate(length, "IMT");
+      
+        IMT->contents[i] = (uintptr_t)table | 1;
+
+        int j = 0;
+        std::set<JavaMethod*>::iterator Interf = atIndex.begin();
+        for (std::vector<JavaMethod*>::iterator it = methods.begin(),
+             et = methods.end(); it != et; ++it, j += 2, ++Interf) {
+          JavaMethod* Imeth = *Interf;
+          JavaMethod* Cmeth = *it;
+          
+          LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+          Function* func = LMI->getMethod();
+          uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+          table[j] = (uintptr_t)Imeth;
+          table[j + 1] = res;
+        }
       }
     }
   }

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=91447&r1=91446&r2=91447&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Tue Dec 15 14:19:41 2009
@@ -772,7 +772,7 @@
   }
 }
 
-void Class::fillIMT(std::vector<JavaMethod*>* meths) {
+void Class::fillIMT(std::set<JavaMethod*>* meths) {
   for (uint32 i = 0; i < nbInterfaces; ++i) {
     interfaces[i]->fillIMT(meths);
   }
@@ -783,7 +783,8 @@
     for (uint32 i = 0; i < nbVirtualMethods; ++i) {
       JavaMethod& meth = virtualMethods[i];
       uint32_t index = InterfaceMethodTable::getIndex(meth.name, meth.type);
-      meths[index].push_back(&meth);
+      if (meths[index].find(&meth) == meths[index].end())
+        meths[index].insert(&meth);
     }
   }
 }

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h?rev=91447&r1=91446&r2=91447&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Tue Dec 15 14:19:41 2009
@@ -25,6 +25,7 @@
 #include "JnjvmConfig.h"
 
 #include <cassert>
+#include <set>
 
 namespace jnjvm {
 
@@ -918,7 +919,7 @@
   /// fillIMT - Fill the vector with vectors of methods with the same IMT
   /// index.
   ///
-  void fillIMT(std::vector<JavaMethod*>* meths);
+  void fillIMT(std::set<JavaMethod*>* meths);
 
 private:
 




From nicolas.geoffray at lip6.fr  Tue Dec 15 13:02:34 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Tue, 15 Dec 2009 21:02:34 -0000
Subject: [vmkit-commits] [vmkit] r91451 - in /vmkit/trunk:
 include/mvm/MethodInfo.h lib/Mvm/Runtime/MethodInfo.cpp
Message-ID: <200912152102.nBFL2YTG021141@zion.cs.uiuc.edu>

Author: geoffray
Date: Tue Dec 15 15:02:34 2009
New Revision: 91451

URL: http://llvm.org/viewvc/llvm-project?rev=91451&view=rev
Log:
Get the CamlFrame of a statically generated function only when needed.


Modified:
    vmkit/trunk/include/mvm/MethodInfo.h
    vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp

Modified: vmkit/trunk/include/mvm/MethodInfo.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/MethodInfo.h?rev=91451&r1=91450&r2=91451&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/MethodInfo.h (original)
+++ vmkit/trunk/include/mvm/MethodInfo.h Tue Dec 15 15:02:34 2009
@@ -32,7 +32,7 @@
   }
 
   unsigned MethodType;
-
+  void* InstructionPointer;
 };
 
 class CamlFrame {

Modified: vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp?rev=91451&r1=91450&r2=91451&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp Tue Dec 15 15:02:34 2009
@@ -22,6 +22,13 @@
 using namespace mvm;
 
 void CamlMethodInfo::scan(void* TL, void* ip, void* addr) {
+  if (!CF && InstructionPointer) {
+    MethodInfo* MI = VirtualMachine::SharedStaticFunctions.IPToMethodInfo(ip);
+    if (MI != &DefaultMethodInfo::DM) {
+      CF = ((CamlMethodInfo*)MI)->CF;
+    }
+  }
+
   if (CF) {
     //uintptr_t spaddr = (uintptr_t)addr + CF->FrameSize + sizeof(void*);
     uintptr_t spaddr = ((uintptr_t*)addr)[0];
@@ -132,12 +139,7 @@
 }
 
 CamlMethodInfo::CamlMethodInfo(CamlFrame* C, void* ip) {
-  if (!C) {
-    MethodInfo* MI = VirtualMachine::SharedStaticFunctions.IPToMethodInfo(ip);
-    if (MI != &DefaultMethodInfo::DM) {
-      C = ((CamlMethodInfo*)MI)->CF;
-    }
-  }
+  InstructionPointer = ip;
   CF = C;
 }
 




From nicolas.geoffray at lip6.fr  Tue Dec 15 13:55:42 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Tue, 15 Dec 2009 21:55:42 -0000
Subject: [vmkit-commits] [vmkit] r91457 - in /vmkit/trunk: include/jnjvm/
 lib/JnJVM/Compiler/ lib/JnJVM/LLVMRuntime/ lib/JnJVM/VMCore/
Message-ID: <200912152155.nBFLtgM0023040@zion.cs.uiuc.edu>

Author: geoffray
Date: Tue Dec 15 15:55:42 2009
New Revision: 91457

URL: http://llvm.org/viewvc/llvm-project?rev=91457&view=rev
Log:
Remove JavaCache and Enveloppe classes, which are not needed anymore.


Removed:
    vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h
Modified:
    vmkit/trunk/include/jnjvm/JnjvmModule.h
    vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h
    vmkit/trunk/lib/JnJVM/VMCore/LinkJavaRuntime.h

Modified: vmkit/trunk/include/jnjvm/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/jnjvm/JnjvmModule.h?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/include/jnjvm/JnjvmModule.h (original)
+++ vmkit/trunk/include/jnjvm/JnjvmModule.h Tue Dec 15 15:55:42 2009
@@ -37,12 +37,10 @@
 
 class ArrayObject;
 class Attribut;
-class CacheNode;
 class CommonClass;
 class Class;
 class ClassArray;
 class ClassPrimitive;
-class Enveloppe;
 class JavaConstantPool;
 class JavaField;
 class JavaMethod;
@@ -232,8 +230,6 @@
   static const llvm::Type* JavaClassArrayType;
   static const llvm::Type* JavaClassPrimitiveType;
   static const llvm::Type* JavaCacheType;
-  static const llvm::Type* EnveloppeType;
-  static const llvm::Type* CacheNodeType;
   static const llvm::Type* ConstantPoolType;
   static const llvm::Type* UTF8Type;
   static const llvm::Type* JavaMethodType;
@@ -282,9 +278,7 @@
   llvm::Function* GetArrayClassFunction;
 
 #ifdef ISOLATE_SHARING
-  llvm::Function* GetCtpCacheNodeFunction;
   llvm::Function* GetCtpClassFunction;
-  llvm::Function* EnveloppeLookupFunction;
   llvm::Function* GetJnjvmExceptionClassFunction;
   llvm::Function* GetJnjvmArrayClassFunction;
   llvm::Function* StaticCtpLookupFunction;
@@ -457,7 +451,6 @@
   virtual llvm::Constant* getVirtualTable(JavaVirtualTable*) = 0;
   virtual llvm::Constant* getMethodInClass(JavaMethod* meth) = 0;
   
-  virtual llvm::Constant* getEnveloppe(Enveloppe* enveloppe) = 0;
   virtual llvm::Constant* getString(JavaString* str) = 0;
   virtual llvm::Constant* getStringPtr(JavaString** str) = 0;
   virtual llvm::Constant* getConstantPool(JavaConstantPool* ctp) = 0;
@@ -564,7 +557,6 @@
   virtual llvm::Constant* getVirtualTable(JavaVirtualTable*);
   virtual llvm::Constant* getMethodInClass(JavaMethod* meth);
   
-  virtual llvm::Constant* getEnveloppe(Enveloppe* enveloppe);
   virtual llvm::Constant* getString(JavaString* str);
   virtual llvm::Constant* getStringPtr(JavaString** str);
   virtual llvm::Constant* getConstantPool(JavaConstantPool* ctp);
@@ -633,7 +625,6 @@
   virtual llvm::Constant* getVirtualTable(JavaVirtualTable*);
   virtual llvm::Constant* getMethodInClass(JavaMethod* meth);
   
-  virtual llvm::Constant* getEnveloppe(Enveloppe* enveloppe);
   virtual llvm::Constant* getString(JavaString* str);
   virtual llvm::Constant* getStringPtr(JavaString** str);
   virtual llvm::Constant* getConstantPool(JavaConstantPool* ctp);
@@ -657,8 +648,6 @@
   //--------------- Static compiler specific functions -----------------------//
   llvm::Constant* CreateConstantFromVT(JavaVirtualTable* VT);
   llvm::Constant* CreateConstantFromUTF8(const UTF8* val);
-  llvm::Constant* CreateConstantFromEnveloppe(Enveloppe* val);
-  llvm::Constant* CreateConstantFromCacheNode(CacheNode* CN);
   llvm::Constant* CreateConstantFromCommonClass(CommonClass* cl);
   llvm::Constant* CreateConstantFromClass(Class* cl);
   llvm::Constant* CreateConstantFromClassPrimitive(ClassPrimitive* cl);
@@ -688,7 +677,6 @@
   std::map<const Class*, llvm::Constant*> staticInstances;
   std::map<const JavaConstantPool*, llvm::Constant*> constantPools;
   std::map<const JavaString*, llvm::Constant*> strings;
-  std::map<const Enveloppe*, llvm::Constant*> enveloppes;
   std::map<const JavaMethod*, llvm::Constant*> nativeFunctions;
   std::map<const UTF8*, llvm::Constant*> utf8s;
   std::map<const Class*, llvm::Constant*> virtualMethods;
@@ -725,9 +713,6 @@
   typedef std::map<const JavaString*, llvm::Constant*>::iterator
     string_iterator;
   
-  typedef std::map<const Enveloppe*, llvm::Constant*>::iterator
-    enveloppe_iterator;
-  
   typedef std::map<const JavaMethod*, llvm::Constant*>::iterator
     native_function_iterator;
   

Modified: vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JITInfo.cpp Tue Dec 15 15:55:42 2009
@@ -19,7 +19,6 @@
 
 #include "mvm/JIT.h"
 
-#include "JavaCache.h"
 #include "JavaConstantPool.h"
 #include "JavaJIT.h"
 #include "JavaString.h"

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Tue Dec 15 15:55:42 2009
@@ -21,7 +21,6 @@
 #include "jnjvm/JnjvmModule.h"
 
 #include "JavaArray.h"
-#include "JavaCache.h"
 #include "JavaConstantPool.h"
 #include "JavaString.h"
 #include "JavaThread.h"
@@ -193,23 +192,6 @@
   abort();
 }
 
-Constant* JavaAOTCompiler::getEnveloppe(Enveloppe* enveloppe) {
-  enveloppe_iterator SI = enveloppes.find(enveloppe);
-  if (SI != enveloppes.end()) {
-    return SI->second;
-  } else {
-    Module& Mod = *getLLVMModule();
-    GlobalVariable* varGV = 
-      new GlobalVariable(Mod, JnjvmModule::EnveloppeType->getContainedType(0),
-                         false, GlobalValue::InternalLinkage, 0, "");
-    enveloppes.insert(std::make_pair(enveloppe, varGV));
-    
-    Constant* C = CreateConstantFromEnveloppe(enveloppe);
-    varGV->setInitializer(C);
-    return varGV;
-  }
-}
-
 Constant* JavaAOTCompiler::getJavaClass(CommonClass* cl) {
   java_class_iterator End = javaClasses.end();
   java_class_iterator I = javaClasses.find(cl);
@@ -769,43 +751,6 @@
 }
 
 
-Constant* JavaAOTCompiler::CreateConstantFromCacheNode(CacheNode* CN) {
-  const StructType* STy = 
-    dyn_cast<StructType>(JnjvmModule::CacheNodeType->getContainedType(0));
-
-  std::vector<Constant*> Elmts;
-  Elmts.push_back(Constant::getNullValue(STy->getContainedType(0)));
-  Elmts.push_back(Constant::getNullValue(STy->getContainedType(1)));
-  Elmts.push_back(Constant::getNullValue(STy->getContainedType(2)));
-  Elmts.push_back(getEnveloppe(CN->enveloppe));
-  
-  return ConstantStruct::get(STy, Elmts);
-}
-
-Constant* JavaAOTCompiler::CreateConstantFromEnveloppe(Enveloppe* val) {
-  
-  const StructType* STy = 
-    dyn_cast<StructType>(JnjvmModule::EnveloppeType->getContainedType(0));
-  const StructType* CNTy = 
-    dyn_cast<StructType>(JnjvmModule::CacheNodeType->getContainedType(0));
-  
-  std::vector<Constant*> Elmts;
-  
-  Constant* firstCache = CreateConstantFromCacheNode(val->firstCache);
-  Elmts.push_back(new GlobalVariable(*getLLVMModule(), CNTy, false,
-                                     GlobalValue::InternalLinkage,
-                                     firstCache, ""));
-  Elmts.push_back(getUTF8(val->methodName));
-  Elmts.push_back(getUTF8(val->methodSign));
-
-  Elmts.push_back(Constant::getNullValue(Type::getInt32Ty(getGlobalContext())));
-  Elmts.push_back(getNativeClass(val->classDef));
-  Elmts.push_back(firstCache);
-
-  return ConstantStruct::get(STy, Elmts);
-  
-}
-
 Constant* JavaAOTCompiler::CreateConstantFromAttribut(Attribut& attribut) {
   const StructType* STy = 
     dyn_cast<StructType>(JnjvmModule::AttributType->getContainedType(0));
@@ -991,14 +936,6 @@
   // nbAttributs
   MethodElts.push_back(ConstantInt::get(Type::getInt16Ty(getGlobalContext()), method.nbAttributs));
   
-  // enveloppes
-  // already allocated by the JIT, don't reallocate them.
-  MethodElts.push_back(Constant::getNullValue(JnjvmModule::EnveloppeType));
-  
-  // nbEnveloppes
-  // 0 because we're not allocating here.
-  MethodElts.push_back(ConstantInt::get(Type::getInt16Ty(getGlobalContext()), 0));
-  
   // classDef
   MethodElts.push_back(getNativeClass(method.classDef));
   
@@ -1698,8 +1635,6 @@
           (unsigned long long int) constantPools.size());
   fprintf(stderr, "Number of strings                   : %llu\n", 
           (unsigned long long int) strings.size());
-  fprintf(stderr, "Number of enveloppes                : %llu\n", 
-          (unsigned long long int) enveloppes.size());
   fprintf(stderr, "Number of native functions          : %llu\n", 
           (unsigned long long int) nativeFunctions.size());
   fprintf(stderr, "----------------- Total size in .data ------------------\n");

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Tue Dec 15 15:55:42 2009
@@ -26,7 +26,6 @@
 
 #include "debug.h"
 #include "JavaArray.h"
-#include "JavaCache.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
 #include "JavaObject.h"
@@ -907,7 +906,6 @@
   readExceptionTable(reader, codeLen);
 
   exploreOpcodes(&compilingClass->bytes->elements[start], codeLen);
-  nbEnveloppes = 0;
 
   if (returnType != Type::getVoidTy(getGlobalContext())) {
     endNode = PHINode::Create(returnType, "", endBlock);
@@ -1126,11 +1124,6 @@
   readExceptionTable(reader, codeLen);
   
   exploreOpcodes(&compilingClass->bytes->elements[start], codeLen);
-  compilingMethod->enveloppes = 
-    new (compilingClass->classLoader->allocator, "Enveloppes")
-    Enveloppe[nbEnveloppes];
-  compilingMethod->nbEnveloppes = nbEnveloppes;
-  nbEnveloppes = 0;
  
   endBlock = createBasicBlock("end");
 
@@ -2188,88 +2181,6 @@
   
   JITVerifyNull(args[0]);
  
-
-#if 0
-
-
-  Value* zero = module->constantZero;
-  Value* one = module->constantOne;
-
-#ifndef ISOLATE_SHARING
-  // ok now the cache
-  Enveloppe& enveloppe = buggyVirtual ?
-    *(new (compilingClass->classLoader->allocator, "Enveloppe") Enveloppe()) :
-    compilingMethod->enveloppes[nbEnveloppes++];
-  if (!inlining)
-    enveloppe.initialise(compilingClass, name, signature->keyName);
-   
-  Value* llvmEnv = TheCompiler->getEnveloppe(&enveloppe);
-#else
-  Value* llvmEnv = getConstantPoolAt(index,
-                                     module->EnveloppeLookupFunction,
-                                     module->EnveloppeType, 0, false);
-#endif
-
-  Value* args1[2] = { zero, zero };
-  Value* cachePtr = GetElementPtrInst::Create(llvmEnv, args1, args1 + 2,
-                                              "", currentBlock);
-  Value* cache = new LoadInst(cachePtr, "", currentBlock);
-
-  Value* VT = CallInst::Create(module->GetVTFunction, args[0], "",
-                               currentBlock);
-  Value* args3[2] = { zero, one };
-  Value* lastCiblePtr = GetElementPtrInst::Create(cache, args3, args3 + 2, "",
-                                                  currentBlock);
-  Value* lastCible = new LoadInst(lastCiblePtr, "", currentBlock);
-
-  Value* cmp = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, VT, lastCible,
-                            "");
-  
-  BasicBlock* ifTrue = createBasicBlock("cache ok");
-  BasicBlock* ifFalse = createBasicBlock("cache not ok");
-  BranchInst::Create(ifTrue, ifFalse, cmp, currentBlock);
-  
-  currentBlock = ifFalse;
-  Value* _meth = invoke(module->InterfaceLookupFunction, cache, args[0],
-                        "", ifFalse);
-  Value* meth = new BitCastInst(_meth, virtualPtrType, "", 
-                                currentBlock);
-#ifdef ISOLATE_SHARING
-  Value* cache2 = new LoadInst(cachePtr, "", currentBlock);
-  Value* newCtpCache = CallInst::Create(module->GetCtpCacheNodeFunction,
-                                        cache2, "", currentBlock);
-  args.push_back(newCtpCache);
-#endif
-  Value* ret = invoke(meth, args, "", currentBlock);
-  if (node) {
-    node->addIncoming(ret, currentBlock);
-  }
-  BranchInst::Create(endBlock, currentBlock);
-
-  currentBlock = ifTrue;
-
-  Value* methPtr = GetElementPtrInst::Create(cache, args1, args1 + 2,
-                                             "", currentBlock);
-
-  _meth = new LoadInst(methPtr, "", currentBlock);
-  meth = new BitCastInst(_meth, virtualPtrType, "", currentBlock);
-  
-#ifdef ISOLATE_SHARING
-  args.pop_back();
-  cache = new LoadInst(cachePtr, "", currentBlock);
-  newCtpCache = CallInst::Create(module->GetCtpCacheNodeFunction,
-                                 cache, "", currentBlock);
-  args.push_back(newCtpCache);
-#endif
-  ret = invoke(meth, args, "", currentBlock);
-  BranchInst::Create(endBlock, currentBlock);
-
-  if (node) {
-    node->addIncoming(ret, currentBlock);
-  }
-
-#else
-
   CommonClass* cl = 0;
   JavaMethod* meth = 0;
   ctpInfo->infoOfMethod(index, ACC_VIRTUAL, cl, meth);
@@ -2375,7 +2286,6 @@
   int32_indvar->addIncoming(int32_indvar_next, currentBlock);
   ptr_table_0_lcssa->addIncoming(ptr_37, currentBlock);
       
-#endif
   currentBlock = endBlock;
   if (node) {
     if (node->getType() == module->JavaObjectType) {

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h Tue Dec 15 15:55:42 2009
@@ -67,7 +67,6 @@
  
   /// JavaJIT - Default constructor.
   JavaJIT(JavaLLVMCompiler* C, JavaMethod* meth, llvm::Function* func) {
-    nbEnveloppes = 0;
     compilingMethod = meth;
     compilingClass = meth->classDef;
     upcalls = compilingClass->classLoader->bootstrapLoader->upcalls;
@@ -463,10 +462,6 @@
   llvm::Instruction* invoke(llvm::Value *F, const char* Name,
                             llvm::BasicBlock *InsertAtEnd);
   
-  /// nbEnveloppes - Number of enveloppes (ie invokeinterface) in this
-  /// method.
-  uint32 nbEnveloppes;
-
 //===--------------------- Yield point support  ---------------------------===//
 
   void checkYieldPoint();

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp Tue Dec 15 15:55:42 2009
@@ -112,13 +112,6 @@
   return ConstantExpr::getIntToPtr(CI, Ty);
 }
 
-Constant* JavaJITCompiler::getEnveloppe(Enveloppe* enveloppe) {
-  assert(enveloppe && "No enveloppe given");
-  ConstantInt* CI = ConstantInt::get(Type::getInt64Ty(getGlobalContext()),
-                                     uint64(enveloppe));
-  return ConstantExpr::getIntToPtr(CI, JnjvmModule::EnveloppeType);
-}
-
 Constant* JavaJITCompiler::getJavaClass(CommonClass* cl) {
   JavaObject* obj = cl->getClassDelegatee(JavaThread::get()->getJVM());
   assert(obj && "Delegatee not created");

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp Tue Dec 15 15:55:42 2009
@@ -2561,7 +2561,6 @@
         break;
       
       case INVOKEINTERFACE :
-        ++nbEnveloppes;
         i += 4;
         break;
 

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Tue Dec 15 15:55:42 2009
@@ -42,8 +42,6 @@
 const llvm::Type* JnjvmModule::JavaArrayDoubleType = 0;
 const llvm::Type* JnjvmModule::JavaArrayLongType = 0;
 const llvm::Type* JnjvmModule::JavaArrayObjectType = 0;
-const llvm::Type* JnjvmModule::CacheNodeType = 0;
-const llvm::Type* JnjvmModule::EnveloppeType = 0;
 const llvm::Type* JnjvmModule::ConstantPoolType = 0;
 const llvm::Type* JnjvmModule::UTF8Type = 0;
 const llvm::Type* JnjvmModule::JavaFieldType = 0;
@@ -148,12 +146,6 @@
   JavaArrayObjectType =
     PointerType::getUnqual(module->getTypeByName("ArrayObject"));
 
-  CacheNodeType =
-    PointerType::getUnqual(module->getTypeByName("CacheNode"));
-  
-  EnveloppeType =
-    PointerType::getUnqual(module->getTypeByName("Enveloppe"));
-  
   JavaFieldType =
     PointerType::getUnqual(module->getTypeByName("JavaField"));
   JavaMethodType =
@@ -254,8 +246,6 @@
   module->addTypeName("ArrayFloat", JavaArrayFloatType->getContainedType(0));
   module->addTypeName("ArrayDouble", JavaArrayDoubleType->getContainedType(0));
   module->addTypeName("ArrayObject", JavaArrayObjectType->getContainedType(0));
-  module->addTypeName("CacheNode", CacheNodeType->getContainedType(0)); 
-  module->addTypeName("Enveloppe", EnveloppeType->getContainedType(0));
    
   InterfaceLookupFunction = module->getFunction("jnjvmInterfaceLookup");
   MultiCallNewFunction = module->getFunction("jnjvmMultiCallNew");
@@ -325,8 +315,6 @@
   GetFinalObjectFieldFunction = module->getFunction("getFinalObjectField");
 
 #ifdef ISOLATE_SHARING
-  EnveloppeLookupFunction = module->getFunction("jnjvmEnveloppeLookup");
-  GetCtpCacheNodeFunction = module->getFunction("getCtpCacheNode");
   GetCtpClassFunction = module->getFunction("getCtpClass");
   GetJnjvmExceptionClassFunction = 
     module->getFunction("getJnjvmExceptionClass");

Modified: vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp Tue Dec 15 15:55:42 2009
@@ -755,15 +755,6 @@
           Value* VT = new LoadInst(VTPtr, "", CI);
           CI->replaceAllUsesWith(VT);
           CI->eraseFromParent();
-        } else if (V == module->GetCtpCacheNodeFunction) {
-          Changed = true;
-          Value* val = Call.getArgument(0); 
-          Value* indexes[2] = { module->constantZero, module->constantFour };
-          Value* VTPtr = GetElementPtrInst::Create(val, indexes,
-                                                   indexes + 2, "", CI);
-          Value* VT = new LoadInst(VTPtr, "", CI);
-          CI->replaceAllUsesWith(VT);
-          CI->eraseFromParent();
         } else if (V == module->GetJnjvmArrayClassFunction) {
           Changed = true;
           Value* val = Call.getArgument(0); 

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Tue Dec 15 15:55:42 2009
@@ -21,13 +21,6 @@
 %ArrayUInt32 = type { %JavaObject, i8*, [0 x i32] }
 %ArrayUInt8 = type { %JavaObject, i8*, [0 x i8] }
 
-;;; The CacheNode type. The first field is the last called method.
-%CacheNode = type { i8*, %VT*, %CacheNode*, %Enveloppe* }
-
-;;; The Enveloppe type, which contains the first cache and all the info
-;;; to lookup in the constant pool.
-%Enveloppe = type { %CacheNode*, %UTF8*, %UTF8*, i32, %JavaClass*, %CacheNode }
-
 ;;; The task class mirror.
 ;;; Field 1: The class state
 ;;; Field 2: The initialization state
@@ -45,7 +38,7 @@
 %JavaField = type { i8*, i16, %UTF8*, %UTF8*, %Attribut*, i16, %JavaClass*, i32,
                     i16, i8* }
 
-%JavaMethod = type { i8*, i16, %Attribut*, i16, %Enveloppe*, i16, %JavaClass*,
+%JavaMethod = type { i8*, i16, %Attribut*, i16, %JavaClass*,
                      %UTF8*, %UTF8*, i8, i8*, i32, i8* }
 
 %JavaClassPrimitive = type { %JavaCommonClass, i32 }

Removed: vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h?rev=91456&view=auto

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h (removed)
@@ -1,120 +0,0 @@
-//===------- JavaCache.h - Inline cache for virtual calls -----------------===//
-//
-//                              JnJVM
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Caches in JnJVM are used when invoking interface methods in the JVM
-// bytecode. A cache is a linked-list of {class, method pointer} pairs that
-// were already encountered during the execution of the program. Its efficiency
-// is based on the hypothesis that for one invokeinterface location, the "this"
-// arguments will share most of the times the same class.
-//
-// At a given time, the first entry in the linked list is the last class of the
-// "this" parameter.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef JNJVM_JAVA_CACHE_H
-#define JNJVM_JAVA_CACHE_H
-
-#include "mvm/Allocator.h"
-#include "mvm/Object.h"
-#include "mvm/Threads/Locks.h"
-
-#include "types.h"
-
-#include "JnjvmConfig.h"
-#include "UTF8.h"
-
-namespace jnjvm {
-
-class Enveloppe;
-class JavaVirtualTable;
-
-/// CacheNode - A {class, method pointer} pair.
-class CacheNode : public mvm::PermanentObject {
-public:
-
-  /// methPtr - The method pointer of this cache.
-  void* methPtr;
-
-  /// lastCible - The VT corresponding to this cache.
-  JavaVirtualTable* lastCible;
-
-  /// next - The next cache.
-  CacheNode* next;
-  
-  /// enveloppe - The container to which this class belongs to.
-  Enveloppe* enveloppe;
-
-  /// CacheNode - Creates a CacheNode with empty values.
-  CacheNode(Enveloppe* E) {
-    lastCible = 0;
-    methPtr = 0;
-    next = 0;
-    enveloppe = E;
-  }
-};
-
-/// Enveloppe - A reference to the linked list of CacheNode.
-class Enveloppe : public mvm::PermanentObject {
-public:
-  
-  /// firstCache - The first entry in the linked list, hence the last
-  /// class occurence for a given invokeinterface call.
-  ///
-  CacheNode *firstCache;
-  
-  /// methodName - The name of the method to be called.
-  ///
-  const UTF8* methodName;
-
-  /// methodSign - The signature of the method to be called.
-  ///
-  const UTF8* methodSign;
-
-  /// cacheLock - The linked list may be modified by concurrent thread. This
-  /// lock ensures that the list stays consistent.
-  ///
-  mvm::SpinLock cacheLock;
-
-  /// classDef - The class that is defining the enveloppe.
-  ///
-  Class* classDef;
-  
-  /// bootCache - The first cache allocated for the enveloppe.
-  ///
-  CacheNode bootCache;
-
-  /// Enveloppe - Default constructor. Does nothing.
-  ///
-  Enveloppe() : bootCache(this) {}
-
-  /// Enveloppe - Allocates the linked list with the given name and signature
-  /// so as the resolution process knows which interface method the
-  /// invokeinterface bytecode refers to.
-  ///
-  Enveloppe(Class* C, const UTF8* name, const UTF8* sign) :
-    bootCache(this) {
-    
-    initialise(C, name, sign);
-  }
-
-  /// initialise - Initialises the enveloppe, and allocates the first cache.
-  ///
-  void initialise(Class* C, const UTF8* name, const UTF8* sign) {
-    classDef = C;
-    firstCache = &bootCache;
-    methodName = name;
-    methodSign = sign;
-  }
-
-};
-
-} // end namespace jnjvm
-
-#endif

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Tue Dec 15 15:55:42 2009
@@ -14,7 +14,6 @@
 
 #include "ClasspathReflect.h"
 #include "JavaArray.h"
-#include "JavaCache.h"
 #include "JavaClass.h"
 #include "JavaCompiler.h"
 #include "JavaConstantPool.h"
@@ -145,11 +144,6 @@
     classDef->classLoader->allocator.Deallocate(cur);
   }
   
-  for (uint32 i = 0; i < nbEnveloppes; ++i) {
-    Enveloppe* cur = &(enveloppes[i]);
-    cur->~Enveloppe();
-    classDef->classLoader->allocator.Deallocate(cur);
-  }
 }
 
 UserClassPrimitive* CommonClass::toPrimitive(Jnjvm* vm) const {
@@ -645,7 +639,6 @@
   canBeInlined = false;
   offset = 0;
   JInfo = 0;
-  enveloppes = 0;
 }
 
 void JavaField::initialise(Class* cl, const UTF8* N, const UTF8* T, uint16 A) {

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Tue Dec 15 15:55:42 2009
@@ -32,7 +32,6 @@
 class ArrayObject;
 class ArrayUInt8;
 class ArrayUInt16;
-class Enveloppe;
 class Class;
 class ClassArray;
 class JavaArray;
@@ -1033,15 +1032,6 @@
   ///
   uint16 nbAttributs;
 
-  /// enveloppes - List of caches in this method. For all invokeinterface
-  /// bytecode there is a corresponding cache.
-  ///
-  Enveloppe* enveloppes;
-
-  /// nbEnveloppes - The number of enveloppes.
-  ///
-  uint16 nbEnveloppes;
-  
   /// classDef - The Java class where the method is defined.
   ///
   Class* classDef;

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h Tue Dec 15 15:55:42 2009
@@ -11,9 +11,10 @@
 #define JNJVM_JAVA_CONSTANT_POOL_H
 
 #include "mvm/Allocator.h"
-
 #include "types.h"
 
+#include "UTF8.h"
+
 namespace jnjvm {
 
 class Class;
@@ -25,7 +26,6 @@
 class Signdef;
 class Typedef;
 
-
 /// JavaConstantPool - This class represents a Java constant pool, a place where
 /// a Java class makes external references such as classes and methods and
 /// stores constants such as integers or UTF8s.

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Tue Dec 15 15:55:42 2009
@@ -11,7 +11,6 @@
 
 #include "ClasspathReflect.h"
 #include "JavaArray.h"
-#include "JavaCache.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
 #include "JavaString.h"
@@ -25,91 +24,6 @@
 
 using namespace jnjvm;
 
-#if 0
-// Throws if the method is not found.
-extern "C" void* jnjvmInterfaceLookup(CacheNode* cache, JavaObject *obj) {
-
-  llvm_gcroot(obj, 0);
-
-  void* res = 0;
-
-  BEGIN_NATIVE_EXCEPTION(1)
-
-  
-  Enveloppe* enveloppe = cache->enveloppe;
-  JavaVirtualTable* ovt = (JavaVirtualTable*)obj->getVirtualTable();
-  
-#ifndef SERVICE
-  assert((obj->getClass()->isClass() && 
-          obj->getClass()->asClass()->isInitializing()) &&
-         "Class not ready in a virtual lookup.");
-#endif
-
-  enveloppe->cacheLock.acquire();
-  CacheNode* rcache = 0;
-  CacheNode* tmp = enveloppe->firstCache;
-  CacheNode* last = tmp;
-
-  while (tmp) {
-    if (ovt == tmp->lastCible) {
-      rcache = tmp;
-      break;
-    } else {
-      last = tmp;
-      tmp = tmp->next;
-    }
-  }
-
-  if (!rcache) {
-    UserCommonClass* ocl = ovt->cl;
-    UserClass* methodCl = 0;
-    UserClass* lookup = ocl->isArray() ? ocl->super : ocl->asClass();
-    JavaMethod* dmeth = lookup->lookupMethodDontThrow(enveloppe->methodName,
-                                                      enveloppe->methodSign,
-                                                      false, true, &methodCl);
-
-    if (!dmeth) {
-      enveloppe->cacheLock.release();
-      JavaThread::get()->getJVM()->noSuchMethodError(lookup,
-                                                     enveloppe->methodName);
-    }
-
-#if !defined(ISOLATE_SHARING) && !defined(SERVICE)
-    assert(dmeth->classDef->isInitializing() &&
-           "Class not ready in a virtual lookup.");
-#endif
-
-    // Are we the first cache?
-    if (cache == &(enveloppe->bootCache) && cache->lastCible == 0) {
-      rcache = cache;
-    } else {
-      mvm::BumpPtrAllocator& alloc = 
-        enveloppe->classDef->classLoader->allocator;
-      rcache = new(alloc, "CacheNode") CacheNode(enveloppe);
-    }
-    
-    rcache->methPtr = dmeth->compiledPtr();
-    rcache->lastCible = ovt;
-    
-  }
-
-  if (enveloppe->firstCache != rcache) {
-    CacheNode *f = enveloppe->firstCache;
-    enveloppe->firstCache = rcache;
-    last->next = rcache->next;
-    rcache->next = f;
-  }
-  
-  enveloppe->cacheLock.release();
-  
-  res = rcache->methPtr;
-  
-  END_NATIVE_EXCEPTION
-
-  return res; 
-}
-#endif
-
 extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index) {
 
   void* res = 0;
@@ -730,14 +644,6 @@
 
 
 #ifdef ISOLATE_SHARING
-extern "C" void* jnjvmEnveloppeLookup(UserClass* cl, uint32 index) {
-  UserConstantPool* ctpInfo = cl->getConstantPool();
-  mvm::Allocator* allocator = cl->classLoader->allocator;
-  Enveloppe* enveloppe = new(allocator) Enveloppe(ctpInfo, index);
-  ctpInfo->ctpRes[index] = enveloppe;
-  return (void*)enveloppe;
-}
-
 extern "C" void* jnjvmStaticCtpLookup(UserClass* cl, uint32 index) {
   UserConstantPool* ctpInfo = cl->getConstantPool();
   JavaConstantPool* shared = ctpInfo->getSharedPool();

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Tue Dec 15 15:55:42 2009
@@ -16,13 +16,13 @@
 
 #include "types.h"
 
-#include "UTF8.h"
 
 #include "mvm/Allocator.h"
 #include "mvm/Object.h"
 
 #include "JavaObject.h"
 #include "JnjvmConfig.h"
+#include "UTF8.h"
 
 namespace jnjvm {
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/LinkJavaRuntime.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LinkJavaRuntime.h?rev=91457&r1=91456&r2=91457&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LinkJavaRuntime.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LinkJavaRuntime.h Tue Dec 15 15:55:42 2009
@@ -13,7 +13,6 @@
 
 
 namespace jnjvm {
-  class CacheNode;
   class JavaObject;
   class UserClass;
   class UserClassArray;
@@ -26,7 +25,7 @@
 
 using namespace jnjvm;
 
-extern "C" void* jnjvmInterfaceLookup(CacheNode* cache, JavaObject *obj);
+extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index);
 extern "C" void* jnjvmVirtualFieldLookup(UserClass* caller, uint32 index);
 extern "C" void* jnjvmStaticFieldLookup(UserClass* caller, uint32 index);
 extern "C" void* jnjvmVirtualTableLookup(UserClass* caller, uint32 index, ...);
@@ -71,7 +70,6 @@
 
 
 #ifdef ISOLATE_SHARING
-extern "C" void* jnjvmEnveloppeLookup(UserClass* cl, uint32 index);
 extern "C" void* jnjvmStaticCtpLookup(UserClass* cl, uint32 index);
 extern "C" UserConstantPool* jnjvmSpecialCtpLookup(UserConstantPool* ctpInfo,
                                                    uint32 index,
@@ -123,7 +121,6 @@
 #endif
 
 #ifdef ISOLATE_SHARING
-      (void) jnjvmEnveloppeLookup(0, 0);
       (void) jnjvmStaticCtpLookup(0, 0);
       (void) jnjvmSpecialCtpLookup(0, 0, 0);
 #endif




From nicolas.geoffray at lip6.fr  Wed Dec 16 11:02:36 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 16 Dec 2009 19:02:36 -0000
Subject: [vmkit-commits] [vmkit] r91550 - /vmkit/trunk/tools/llcj/llcj.cpp
Message-ID: <200912161902.nBGJ2aJR026554@zion.cs.uiuc.edu>

Author: geoffray
Date: Wed Dec 16 13:02:36 2009
New Revision: 91550

URL: http://llvm.org/viewvc/llvm-project?rev=91550&view=rev
Log:
Don't link with boehm gc if vmkit is not configured with it.


Modified:
    vmkit/trunk/tools/llcj/llcj.cpp

Modified: vmkit/trunk/tools/llcj/llcj.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/llcj/llcj.cpp?rev=91550&r1=91549&r2=91550&view=diff

==============================================================================
--- vmkit/trunk/tools/llcj/llcj.cpp (original)
+++ vmkit/trunk/tools/llcj/llcj.cpp Wed Dec 16 13:02:36 2009
@@ -215,7 +215,9 @@
     gccArgv[gccArgc++] = VMKITLibs2;
     gccArgv[gccArgc++] = VMKITLibs3;
     gccArgv[gccArgc++] = "-pthread";
-    gccArgv[gccArgc++] = "-lgc"; // does not hurt to add it
+#ifdef USE_GC_BOEHM
+    gccArgv[gccArgc++] = "-lgc";
+#endif
     gccArgv[gccArgc++] = "-lm";
     gccArgv[gccArgc++] = "-ldl";
     gccArgv[gccArgc++] = "-lz";




From nicolas.geoffray at lip6.fr  Wed Dec 16 12:10:15 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 16 Dec 2009 20:10:15 -0000
Subject: [vmkit-commits] [vmkit] r91561 - in /vmkit/trunk: ./ autoconf/
 include/j3/ include/jnjvm/ lib/ lib/J3/ lib/J3/Classpath/ lib/J3/Compiler/
 lib/J3/IJvm/ lib/J3/Isolate/ lib/J3/LLVMRuntime/ lib/J3/VMCore/ lib/JnJVM/
 tools/ tools/j3/ tools/jnjvm/ tools/llcj/ tools/vmjc/ tools/vmkit/ www/
Message-ID: <200912162010.nBGKAGmY029536@zion.cs.uiuc.edu>

Author: geoffray
Date: Wed Dec 16 14:10:15 2009
New Revision: 91561

URL: http://llvm.org/viewvc/llvm-project?rev=91561&view=rev
Log:
Start renaming JnJVM to J3. Next step is the actual use of jnjvm in 
c++ code.


Added:
    vmkit/trunk/include/j3/
      - copied from r91445, vmkit/trunk/include/jnjvm/
    vmkit/trunk/include/j3/JavaCompiler.h
      - copied unchanged from r91558, vmkit/trunk/include/jnjvm/JavaCompiler.h
    vmkit/trunk/include/j3/JnjvmModule.h
      - copied unchanged from r91558, vmkit/trunk/include/jnjvm/JnjvmModule.h
    vmkit/trunk/include/j3/JnjvmModuleProvider.h
      - copied unchanged from r91558, vmkit/trunk/include/jnjvm/JnjvmModuleProvider.h
    vmkit/trunk/include/j3/OpcodeNames.def
      - copied unchanged from r91558, vmkit/trunk/include/jnjvm/OpcodeNames.def
    vmkit/trunk/lib/J3/
      - copied from r91445, vmkit/trunk/lib/JnJVM/
    vmkit/trunk/lib/J3/Classpath/
      - copied from r91558, vmkit/trunk/lib/JnJVM/Classpath/
    vmkit/trunk/lib/J3/Compiler/
      - copied from r91558, vmkit/trunk/lib/JnJVM/Compiler/
    vmkit/trunk/lib/J3/IJvm/
      - copied from r91558, vmkit/trunk/lib/JnJVM/IJvm/
    vmkit/trunk/lib/J3/Isolate/
      - copied from r91558, vmkit/trunk/lib/JnJVM/Isolate/
    vmkit/trunk/lib/J3/LLVMRuntime/
      - copied from r91558, vmkit/trunk/lib/JnJVM/LLVMRuntime/
    vmkit/trunk/lib/J3/Makefile
      - copied unchanged from r91558, vmkit/trunk/lib/JnJVM/Makefile
    vmkit/trunk/lib/J3/README.txt
      - copied unchanged from r91558, vmkit/trunk/lib/JnJVM/README.txt
    vmkit/trunk/lib/J3/VMCore/
      - copied from r91558, vmkit/trunk/lib/JnJVM/VMCore/
    vmkit/trunk/tools/j3/
      - copied from r91445, vmkit/trunk/tools/jnjvm/
    vmkit/trunk/tools/j3/Main.cpp
      - copied, changed from r91558, vmkit/trunk/tools/jnjvm/Main.cpp
    vmkit/trunk/tools/j3/Makefile
      - copied, changed from r91558, vmkit/trunk/tools/jnjvm/Makefile
Removed:
    vmkit/trunk/include/jnjvm/
    vmkit/trunk/lib/JnJVM/
    vmkit/trunk/tools/jnjvm/
Modified:
    vmkit/trunk/CREDITS.TXT
    vmkit/trunk/Makefile
    vmkit/trunk/Makefile.config.in
    vmkit/trunk/README.txt
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJIT.h
    vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
    vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
    vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
    vmkit/trunk/lib/J3/Compiler/Makefile
    vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
    vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/J3/VMCore/Makefile
    vmkit/trunk/lib/Makefile
    vmkit/trunk/tools/Makefile
    vmkit/trunk/tools/llcj/llcj.cpp
    vmkit/trunk/tools/vmjc/Makefile
    vmkit/trunk/tools/vmjc/vmjc.cpp
    vmkit/trunk/tools/vmkit/Launcher.cpp
    vmkit/trunk/tools/vmkit/Makefile
    vmkit/trunk/www/get_started.html
    vmkit/trunk/www/use_mmtk.html

Modified: vmkit/trunk/CREDITS.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/CREDITS.TXT?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/CREDITS.TXT (original)
+++ vmkit/trunk/CREDITS.TXT Wed Dec 16 14:10:15 2009
@@ -16,7 +16,7 @@
 N: Nicolas Geoffray
 E: nicolas.geoffray at lip6.fr
 W: http://www-src.lip6.fr/homepages/Nicolas.Geoffray/
-D: Port of JnJVM to LLVM
+D: Architect of J3, originally a port of JnJVM to LLVM
 D: Architect of N3
 
 N: Sylvain Marechal

Modified: vmkit/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/Makefile (original)
+++ vmkit/trunk/Makefile Wed Dec 16 14:10:15 2009
@@ -29,5 +29,5 @@
 #------------------------------------------------------------------------
 FilesToConfig := \
   include/llvm/Config/config.h \
-  lib/JnJVM/Classpath/Classpath.h \
+  lib/J3/Classpath/Classpath.h \
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))

Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Wed Dec 16 14:10:15 2009
@@ -2,7 +2,7 @@
 WITH_N3 = @WITH_N3@
 WITH_N3_PNETLIB = @WITH_N3_PNETLIB@
 WITH_N3_MONO = @WITH_N3_MONO@
-WITH_JNJVM = @WITH_JNJVM@
+WITH_J3 = @WITH_J3@
 N3_LIB = @N3_LIB@
 GC_MULTI_MMAP = @GC_MULTI_MMAP@
 GC_SINGLE_MMAP = @GC_SINGLE_MMAP@

Modified: vmkit/trunk/README.txt
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/README.txt?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/README.txt (original)
+++ vmkit/trunk/README.txt Wed Dec 16 14:10:15 2009
@@ -4,10 +4,10 @@
 
 VMKit is the composition of three libraries:
 1) MVM: mostly a garbage collector
-2) JnJVM: a Java Virtual Machine implemented with MVM and LLVM
+2) J3: a Java Virtual Machine implemented with MVM and LLVM
 3) N3: a CLI implementation with MVM and LLVM
 
-JnJVM and N3 use GCC's unwinding library (libgcc_s.so).
+J3 and N3 use GCC's unwinding library (libgcc_s.so).
 
 These are the options you should pass to the ./configure script
 --with-llvmsrc: the source directory of LLVM
@@ -22,9 +22,9 @@
 --with-mono: Mono's mscorlib.dll
 
 Running make on the root tree will produce the following "tools":
-1) Debug|Release/bin/jnjvm: running the JnJVM like any other JVM.
+1) Debug|Release/bin/j3: running the J3 like any other JVM.
 2) Debug|Release/bin/n3-pnetlib: running N3 like CLR.
 2) Debug|Release/bin/vmkit: shell-like vm launcher.
 2) Debug|Release/bin/vmjc: ahead of time compiler for .class files.
 
-JnJVM and N3 have their own README notes.
+J3 and N3 have their own README notes.

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Wed Dec 16 14:10:15 2009
@@ -331,32 +331,32 @@
 
 AC_ARG_WITH(gnu-classpath-glibj,
        [AS_HELP_STRING(--with-gnu-classpath-glibj,
-           [Build JnJVM with GNU Classpath install (default is '/usr/share/classpath/glibj.zip')])],
+           [Build J3 with GNU Classpath install (default is '/usr/share/classpath/glibj.zip')])],
        [[classpathglibj=$withval]],
        [[classpathglibj=/usr/share/classpath/glibj.zip]]
 )
 
-AC_ARG_WITH(jnjvm,
-       [AS_HELP_STRING(--with-jnjvm=yes|no,
-        [Build JnJVM (default is yes)])],
-       [[WITH_JNJVM=$withval]],
-       [[WITH_JNJVM=yes]]
+AC_ARG_WITH(j3,
+       [AS_HELP_STRING(--with-j3=yes|no,
+        [Build J3 (default is yes)])],
+       [[WITH_J3=$withval]],
+       [[WITH_J3=yes]]
 )
 
 classpathinclude="-I${classpathlibs}/../include -I/usr/include/classpath";
 
-if test "x${WITH_JNJVM}" = "xyes"; then
-  WITH_JNJVM=1;
-  AC_DEFINE([WITH_JNJVM], [1], [With JNJVM])
+if test "x${WITH_J3}" = "xyes"; then
+  WITH_J3=1;
+  AC_DEFINE([WITH_J3], [1], [With J3])
 else
-  WITH_JNJVM=0;
+  WITH_J3=0;
 fi 
 
 AC_SUBST([classpathglibj])
 AC_SUBST([classpathlibs])
 AC_SUBST([classpathinclude])
 AC_SUBST([classpathversion])
-AC_SUBST([WITH_JNJVM])
+AC_SUBST([WITH_J3])
 
 dnl **************************************************************************
 dnl Local PNet directory
@@ -591,7 +591,7 @@
 dnl Configure a common Makefile
 AC_CONFIG_FILES(Makefile.common)
 AC_CONFIG_FILES(Makefile.config)
-AC_CONFIG_FILES([lib/JnJVM/Classpath/Classpath.h])
+AC_CONFIG_FILES([lib/J3/Classpath/Classpath.h])
 AC_CONFIG_FILES([lib/N3/PNetLib/PNetPath.inc])
 AC_CONFIG_FILES([lib/N3/Mono/MonoPath.inc])
 AC_CONFIG_FILES([tools/llcj/LinkPaths.h])

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Wed Dec 16 14:10:15 2009
@@ -700,7 +700,7 @@
 classpathlibs
 classpathinclude
 classpathversion
-WITH_JNJVM
+WITH_J3
 pnetlocalprefix
 WITH_N3_PNETLIB
 N3_LIB
@@ -1338,9 +1338,9 @@
                           GNU CLASSPATH libraries (default is
                           /usr/lib/classpath)
   --with-gnu-classpath-glibj
-                          Build JnJVM with GNU Classpath install (default is
+                          Build J3 with GNU Classpath install (default is
                           '/usr/share/classpath/glibj.zip')
-  --with-jnjvm=yes|no     Build JnJVM (default is yes)
+  --with-j3=yes|no        Build J3 (default is yes)
   --with-pnet-local-prefix=something
                           PNET local prefix (no default)
   --with-pnetlib=something
@@ -4091,26 +4091,26 @@
 
 
 
-# Check whether --with-jnjvm was given.
-if test "${with_jnjvm+set}" = set; then
-  withval=$with_jnjvm; WITH_JNJVM=$withval
+# Check whether --with-j3 was given.
+if test "${with_j3+set}" = set; then
+  withval=$with_j3; WITH_J3=$withval
 else
-  WITH_JNJVM=yes
+  WITH_J3=yes
 
 fi
 
 
 classpathinclude="-I${classpathlibs}/../include -I/usr/include/classpath";
 
-if test "x${WITH_JNJVM}" = "xyes"; then
-  WITH_JNJVM=1;
+if test "x${WITH_J3}" = "xyes"; then
+  WITH_J3=1;
 
 cat >>confdefs.h <<\_ACEOF
-#define WITH_JNJVM 1
+#define WITH_J3 1
 _ACEOF
 
 else
-  WITH_JNJVM=0;
+  WITH_J3=0;
 fi
 
 
@@ -7228,7 +7228,7 @@
 
 ac_config_files="$ac_config_files Makefile.config"
 
-ac_config_files="$ac_config_files lib/JnJVM/Classpath/Classpath.h"
+ac_config_files="$ac_config_files lib/J3/Classpath/Classpath.h"
 
 ac_config_files="$ac_config_files lib/N3/PNetLib/PNetPath.inc"
 
@@ -7811,7 +7811,7 @@
     "include/mvm/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/mvm/Config/config.h" ;;
     "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
     "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
-    "lib/JnJVM/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/JnJVM/Classpath/Classpath.h" ;;
+    "lib/J3/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/J3/Classpath/Classpath.h" ;;
     "lib/N3/PNetLib/PNetPath.inc") CONFIG_FILES="$CONFIG_FILES lib/N3/PNetLib/PNetPath.inc" ;;
     "lib/N3/Mono/MonoPath.inc") CONFIG_FILES="$CONFIG_FILES lib/N3/Mono/MonoPath.inc" ;;
     "tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES tools/llcj/LinkPaths.h" ;;
@@ -7961,7 +7961,7 @@
 classpathlibs!$classpathlibs$ac_delim
 classpathinclude!$classpathinclude$ac_delim
 classpathversion!$classpathversion$ac_delim
-WITH_JNJVM!$WITH_JNJVM$ac_delim
+WITH_J3!$WITH_J3$ac_delim
 pnetlocalprefix!$pnetlocalprefix$ac_delim
 WITH_N3_PNETLIB!$WITH_N3_PNETLIB$ac_delim
 N3_LIB!$N3_LIB$ac_delim

Modified: vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JITInfo.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JITInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JITInfo.cpp Wed Dec 16 14:10:15 2009
@@ -28,8 +28,8 @@
 #include "Jnjvm.h"
 #include "Reader.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 #include <cstdio>
 

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Wed Dec 16 14:10:15 2009
@@ -18,7 +18,7 @@
 
 #include "mvm/Threads/Thread.h"
 
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
 
 #include "JavaArray.h"
 #include "JavaConstantPool.h"

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Wed Dec 16 14:10:15 2009
@@ -37,8 +37,8 @@
 #include "Jnjvm.h"
 #include "Reader.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 using namespace jnjvm;
 using namespace llvm;

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Wed Dec 16 14:10:15 2009
@@ -25,7 +25,7 @@
 
 #include "JavaClass.h"
 #include "JavaUpcalls.h"
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
 
 namespace jnjvm {
 

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Wed Dec 16 14:10:15 2009
@@ -28,8 +28,8 @@
 #include "JavaThread.h"
 #include "Jnjvm.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 using namespace jnjvm;
 using namespace llvm;

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Wed Dec 16 14:10:15 2009
@@ -33,10 +33,10 @@
 #include "JavaTypes.h"
 #include "Jnjvm.h"
 
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
 
 #if DEBUG > 0 && (JNJVM_COMPILE > 0 || JNJVM_EXECUTE > 0)
-#include "jnjvm/OpcodeNames.def"
+#include "j3/OpcodeNames.def"
 #endif
 
 using namespace jnjvm;

Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp Wed Dec 16 14:10:15 2009
@@ -24,8 +24,8 @@
 #include "JavaJIT.h"
 #include "JavaTypes.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 using namespace jnjvm;
 using namespace llvm;

Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp Wed Dec 16 14:10:15 2009
@@ -20,8 +20,8 @@
 #include "JavaTypes.h"
 #include "Jnjvm.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 using namespace llvm;
 using namespace jnjvm;

Modified: vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp Wed Dec 16 14:10:15 2009
@@ -17,7 +17,7 @@
 #include "llvm/Support/Debug.h"
 
 #include "JavaClass.h"
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
 
 using namespace llvm;
 

Modified: vmkit/trunk/lib/J3/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/Makefile?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/Makefile (original)
+++ vmkit/trunk/lib/J3/Compiler/Makefile Wed Dec 16 14:10:15 2009
@@ -11,9 +11,9 @@
 include $(LEVEL)/Makefile.config
 
 ifeq ($(WITH_LLVM_GCC), 1)
-  MODULE_NAME = JnjvmCompiler
+  MODULE_NAME = J3Compiler
 else
-  LIBRARYNAME = JnjvmCompiler
+  LIBRARYNAME = J3Compiler
 endif
 
 EXTRA_DIST = ExceptionsCheck.inc ExceptionsDwarf.inc

Modified: vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp Wed Dec 16 14:10:15 2009
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "mvm/VirtualMachine.h"
-#include "jnjvm/JavaCompiler.h"
+#include "j3/JavaCompiler.h"
 
 #include "JavaArray.h"
 #include "JavaClass.h"

Modified: vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp Wed Dec 16 14:10:15 2009
@@ -18,7 +18,7 @@
 #include "JavaTypes.h"
 #include "Jnjvm.h"
 
-#include "jnjvm/OpcodeNames.def"
+#include "j3/OpcodeNames.def"
 
 #include <cstdarg>
 

Modified: vmkit/trunk/lib/J3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Makefile?rev=91561&r1=91558&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/J3/VMCore/Makefile Wed Dec 16 14:10:15 2009
@@ -11,15 +11,15 @@
 include $(LEVEL)/Makefile.config
 
 ifeq ($(WITH_LLVM_GCC), 1)
-  MODULE_NAME = JnJVM
+  MODULE_NAME = J3
 else
-  LIBRARYNAME = JnJVM
+  LIBRARYNAME = J3
 endif
 
 
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../Classpath -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath $(CLASSPATH_FLAGS) -I$(PROJ_SRC_DIR)/../../../include/jnjvm
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../Classpath -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath $(CLASSPATH_FLAGS) -I$(PROJ_SRC_DIR)/../../../include/j3
 
 ifeq ($(ISOLATE_BUILD), 1)
   CXX.Flags += -I$(PROJ_SRC_DIR)/../Isolate

Modified: vmkit/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Makefile?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/lib/Makefile (original)
+++ vmkit/trunk/lib/Makefile Wed Dec 16 14:10:15 2009
@@ -12,8 +12,8 @@
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(WITH_JNJVM), 1)
-PARALLEL_DIRS += JnJVM
+ifeq ($(WITH_J3), 1)
+PARALLEL_DIRS += J3
 endif
 
 ifeq ($(WITH_N3), 1)

Modified: vmkit/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/Makefile?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/Makefile (original)
+++ vmkit/trunk/tools/Makefile Wed Dec 16 14:10:15 2009
@@ -12,8 +12,8 @@
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(WITH_JNJVM), 1)
-  PARALLEL_DIRS += jnjvm
+ifeq ($(WITH_J3), 1)
+  PARALLEL_DIRS += j3
   PARALLEL_DIRS += vmjc
   PARALLEL_DIRS += llcj
 endif

Copied: vmkit/trunk/tools/j3/Main.cpp (from r91558, vmkit/trunk/tools/jnjvm/Main.cpp)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?p2=vmkit/trunk/tools/j3/Main.cpp&p1=vmkit/trunk/tools/jnjvm/Main.cpp&r1=91558&r2=91561&rev=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/jnjvm/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Wed Dec 16 14:10:15 2009
@@ -13,8 +13,8 @@
 #include "mvm/VirtualMachine.h"
 #include "mvm/Threads/Thread.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 #include "llvm/Support/ManagedStatic.h"
 

Copied: vmkit/trunk/tools/j3/Makefile (from r91558, vmkit/trunk/tools/jnjvm/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Makefile?p2=vmkit/trunk/tools/j3/Makefile&p1=vmkit/trunk/tools/jnjvm/Makefile&r1=91558&r2=91561&rev=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/jnjvm/Makefile (original)
+++ vmkit/trunk/tools/j3/Makefile Wed Dec 16 14:10:15 2009
@@ -10,24 +10,24 @@
 
 include $(LEVEL)/Makefile.config
 
-TOOLNAME = jnjvm
+TOOLNAME = j3
 
 ifeq ($(WITH_LLVM_GCC), 1)
 
-  MODULESNAME = jnjvm
-  USEDMODULES = JnJVM.bc Classpath.bc JnjvmCompiler.bc Allocator.bc CommonThread.bc \
+  MODULESNAME = j3
+  USEDMODULES = J3.bc Classpath.bc J3Compiler.bc Allocator.bc CommonThread.bc \
 		Mvm.bc MvmCompiler.bc $(GCLIB).bc
 
   ifeq ($(ISOLATE_SHARING_BUILD), 1) 
     USEDMODULES += Isolate.bc
   endif
 
-  BUILT_SOURCES = jnjvm.s
-  SOURCES = jnjvm.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+  BUILT_SOURCES = j3.s
+  SOURCES = j3.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
 
 else
 
-USEDLIBS = JnJVM.a Classpath.a JnJVM.a JnjvmCompiler.a Allocator.a \
+USEDLIBS = J3.a Classpath.a J3.a J3Compiler.a Allocator.a \
 	   Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
 
   ifeq ($(ISOLATE_SHARING_BUILD), 1) 

Modified: vmkit/trunk/tools/llcj/llcj.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/llcj/llcj.cpp?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/llcj/llcj.cpp (original)
+++ vmkit/trunk/tools/llcj/llcj.cpp Wed Dec 16 14:10:15 2009
@@ -221,12 +221,12 @@
     gccArgv[gccArgc++] = "-lm";
     gccArgv[gccArgc++] = "-ldl";
     gccArgv[gccArgc++] = "-lz";
-    gccArgv[gccArgc++] = "-lJnJVM";
+    gccArgv[gccArgc++] = "-lJ3";
     gccArgv[gccArgc++] = "-lClasspath";
-    gccArgv[gccArgc++] = "-lJnJVM";
+    gccArgv[gccArgc++] = "-lJ3";
     gccArgv[gccArgc++] = "-lClasspath";
     if (withJIT) {
-      gccArgv[gccArgc++] = "-lJnJVMCompiler";
+      gccArgv[gccArgc++] = "-lJ3Compiler";
     }
     gccArgv[gccArgc++] = "-lAllocator";
     gccArgv[gccArgc++] = "-lCommonThread";

Modified: vmkit/trunk/tools/vmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/Makefile?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/Makefile (original)
+++ vmkit/trunk/tools/vmjc/Makefile Wed Dec 16 14:10:15 2009
@@ -17,7 +17,7 @@
 
 ifeq ($(WITH_LLVM_GCC), 1)
   MODULESNAME = vmkit
-  USEDMODULES = JnJVM.bc Classpath.bc JnjvmCompiler.bc Allocator.bc \
+  USEDMODULES = J3.bc Classpath.bc J3Compiler.bc Allocator.bc \
 		CommonThread.bc Mvm.bc MvmCompiler.bc $(GCLIB).bc
 
   BUILT_SOURCES = vmkit.s
@@ -25,7 +25,7 @@
 
 else
 
-  USEDLIBS = JnJVM.a Classpath.a JnJVM.a JnjvmCompiler.a Allocator.a \
+  USEDLIBS = J3.a Classpath.a J3.a J3Compiler.a Allocator.a \
 	     Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
 endif
 

Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Wed Dec 16 14:10:15 2009
@@ -43,11 +43,11 @@
 #include "mvm/VirtualMachine.h"
 #include "mvm/Threads/Thread.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
-#include "../../lib/JnJVM/VMCore/JnjvmClassLoader.h"
-#include "../../lib/JnJVM/VMCore/Jnjvm.h"
+#include "../../lib/J3/VMCore/JnjvmClassLoader.h"
+#include "../../lib/J3/VMCore/Jnjvm.h"
 
 #include <iostream>
 #include <fstream>

Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Dec 16 14:10:15 2009
@@ -1,6 +1,6 @@
 //===--------- Launcher.cpp - Launch command line -------------------------===//
 //
-//                            JnJVM
+//                          The VMKit project
 //
 // This file is distributed under the University of Pierre et Marie Curie 
 // License. See LICENSE.TXT for details.
@@ -25,8 +25,8 @@
 #include "mvm/VirtualMachine.h"
 #include "mvm/Threads/Thread.h"
 
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
 
 #include "CommandLine.h"
 

Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Wed Dec 16 14:10:15 2009
@@ -1,6 +1,6 @@
-##===- tools/jnjvm/Makefile --------------------------------*- Makefile -*-===##
+##===- tools/vmkit/Makefile --------------------------------*- Makefile -*-===##
 # 
-#                     The vmkit project
+#                     The VMKit project
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
@@ -17,8 +17,8 @@
 
   MODULESNAME = vmkit
 
-  ifeq ($(WITH_JNJVM), 1)
-    USEDMODULES += JnJVM.bc Classpath.bc JnjvmCompiler.bc
+  ifeq ($(WITH_J3), 1)
+    USEDMODULES += J3.bc Classpath.bc JnjvmCompiler.bc
   endif
 
   ifeq ($(ISOLATE_SHARING_BUILD), 1) 
@@ -36,9 +36,11 @@
 
 
 else
+  
+  USEDLIBS += Allocator.a Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
 
-  ifeq ($(WITH_JNJVM), 1)
-    USEDLIBS += JnJVM.a Classpath.a JnJVM.a JnjvmCompiler.a
+  ifeq ($(WITH_J3), 1)
+    USEDLIBS += J3.a Classpath.a J3.a J3Compiler.a
   endif
 
   ifeq ($(ISOLATE_SHARING_BUILD), 1) 
@@ -48,7 +50,7 @@
   ifeq ($(WITH_N3_PNETLIB), 1)
     USEDLIBS += N3.a PNetLib.a
   endif
-
+  
   USEDLIBS += Allocator.a Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
 
 endif

Modified: vmkit/trunk/www/get_started.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/get_started.html?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/www/get_started.html (original)
+++ vmkit/trunk/www/get_started.html Wed Dec 16 14:10:15 2009
@@ -124,8 +124,8 @@
 
   <li>Try it out: (assuming vmkit/Debug/bin is in your path)</li>
   <ul>
-    <li><tt>jnjvm --help</tt></li>
-    <li><tt>jnjvm HelloWorld</tt></li>
+    <li><tt>j3 --help</tt></li>
+    <li><tt>j3 HelloWorld</tt></li>
     <li><tt>n3-pnetlib --help</tt></li>
     <li><tt>n3-pnetlib HelloWorld.exe</tt></li>
   </ul>

Modified: vmkit/trunk/www/use_mmtk.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/use_mmtk.html?rev=91561&r1=91560&r2=91561&view=diff

==============================================================================
--- vmkit/trunk/www/use_mmtk.html (original)
+++ vmkit/trunk/www/use_mmtk.html Wed Dec 16 14:10:15 2009
@@ -37,7 +37,7 @@
   <li>Run VMKit with MMTk:</li>
    <ul>
      <li><tt>Release/bin/vmkit -std-compile-opts --load-bc=Release/lib/FinalMMTk.bc
-             -load-bc=lib/JnJVM/LLVMRuntime/LLVMRuntime.gen.ll -java Foo </tt></li>
+             -load-bc=lib/J3/LLVMRuntime/LLVMRuntime.gen.ll -java Foo </tt></li>
    </ul>
 
 </ol>




From nicolas.geoffray at lip6.fr  Wed Dec 16 12:47:08 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 16 Dec 2009 20:47:08 -0000
Subject: [vmkit-commits] [vmkit] r91565 - in /vmkit/trunk:
 lib/Mvm/Compiler/JIT.cpp mmtk/magic/LowerJavaRT.cpp
 mmtk/mmtk-alloc/Makefile mmtk/mmtk-fake/Makefile mmtk/mmtk-j3/Makefile
 tools/vmkit/Makefile
Message-ID: <200912162047.nBGKl82a030823@zion.cs.uiuc.edu>

Author: geoffray
Date: Wed Dec 16 14:47:08 2009
New Revision: 91565

URL: http://llvm.org/viewvc/llvm-project?rev=91565&view=rev
Log:
Forgot to update these files from previous commit.


Modified:
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
    vmkit/trunk/mmtk/magic/LowerJavaRT.cpp
    vmkit/trunk/mmtk/mmtk-alloc/Makefile
    vmkit/trunk/mmtk/mmtk-fake/Makefile
    vmkit/trunk/mmtk/mmtk-j3/Makefile
    vmkit/trunk/tools/vmkit/Makefile

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Wed Dec 16 14:47:08 2009
@@ -224,7 +224,7 @@
     assert(F && "Could not find boot from HeapGrowthManager");
     BootHeapType BootHeap = (BootHeapType)
       (uintptr_t)executionEngine->getPointerToFunction(F);
-    BootHeap(50 * 1024 * 1024, 100 * 1024 * 1024);
+    BootHeap(128 * 1024 * 1024, 1024 * 1024 * 1024);
     
     GV = globalModule->getGlobalVariable("org_j3_config_Selected_4Plan_static", false);
     assert(GV && "No global plan.");

Modified: vmkit/trunk/mmtk/magic/LowerJavaRT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/LowerJavaRT.cpp?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/magic/LowerJavaRT.cpp (original)
+++ vmkit/trunk/mmtk/magic/LowerJavaRT.cpp Wed Dec 16 14:47:08 2009
@@ -18,7 +18,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
 
 
 using namespace llvm;

Modified: vmkit/trunk/mmtk/mmtk-alloc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Makefile Wed Dec 16 14:47:08 2009
@@ -20,7 +20,7 @@
 LOADABLE_MODULE = 1
 USEDLIBS =
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/JnJVM/VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/J3/VMCore
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/mmtk-fake/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-fake/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-fake/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-fake/Makefile Wed Dec 16 14:47:08 2009
@@ -15,7 +15,7 @@
 LOADABLE_MODULE = 1
 USEDLIBS =
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/JnJVM/VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/J3/VMCore
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/mmtk-j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Makefile Wed Dec 16 14:47:08 2009
@@ -20,7 +20,7 @@
 LOADABLE_MODULE = 1
 USEDLIBS =
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/JnJVM/VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/J3/VMCore
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Wed Dec 16 14:47:08 2009
@@ -18,7 +18,7 @@
   MODULESNAME = vmkit
 
   ifeq ($(WITH_J3), 1)
-    USEDMODULES += J3.bc Classpath.bc JnjvmCompiler.bc
+    USEDMODULES += J3.bc Classpath.bc J3Compiler.bc
   endif
 
   ifeq ($(ISOLATE_SHARING_BUILD), 1) 




From nicolas.geoffray at lip6.fr  Wed Dec 16 13:23:52 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 16 Dec 2009 21:23:52 -0000
Subject: [vmkit-commits] [vmkit] r91567 - in /vmkit/trunk: configure
 include/mvm/Config/config.h.in tools/vmkit/Launcher.cpp
Message-ID: <200912162123.nBGLNqYO032002@zion.cs.uiuc.edu>

Author: geoffray
Date: Wed Dec 16 15:23:52 2009
New Revision: 91567

URL: http://llvm.org/viewvc/llvm-project?rev=91567&view=rev
Log:
Obvious name fixes.


Modified:
    vmkit/trunk/configure
    vmkit/trunk/include/mvm/Config/config.h.in
    vmkit/trunk/tools/vmkit/Launcher.cpp

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=91567&r1=91566&r2=91567&view=diff

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Wed Dec 16 15:23:52 2009
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for vmkit 0.27svn.
+# Generated by GNU Autoconf 2.63 for vmkit 0.27svn.
 #
 # Report bugs to <nicolas.geoffray at lip6.fr>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -19,7 +19,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -41,17 +41,45 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -67,8 +95,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -91,7 +117,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -104,17 +130,10 @@
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -136,7 +155,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -162,7 +181,7 @@
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -244,7 +263,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -265,7 +284,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -345,10 +364,10 @@
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -417,9 +436,10 @@
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -455,7 +475,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -483,7 +503,6 @@
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -496,19 +515,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -533,10 +555,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -618,124 +640,141 @@
 #endif"
 
 ac_unique_file=""Makefile.common.in""
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-VMKIT_COPYRIGHT
-LLVM_SRC
-LLVM_OBJ
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-DYLIB_EXTENSION
-WITH_LLVM_GCC
-LLVM_FLAGS
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CPP
-GREP
-EGREP
-WITH_64
-GC_MMAP2
-GC_BOEHM
-GC_MMTK
-GC_MULTI_MMAP
-GC_SINGLE_MMAP
-GC_FLAGS
-GC_LIBS
-SINGLE_BUILD
-SERVICE_BUILD
-ISOLATE_BUILD
-VM_FLAGS
-EXCEPTION_FLAGS
-classpathglibj
-classpathlibs
-classpathinclude
-classpathversion
-WITH_J3
-pnetlocalprefix
-WITH_N3_PNETLIB
-N3_LIB
-pnetlibpath
-WITH_N3_MONO
-monopath
-WITH_N3
-CXX
-CXXFLAGS
-ac_ct_CXX
-NM
-LN_S
-CMP
-CP
-DATE
-FIND
-MKDIR
-MV
-RANLIB
-RM
-SED
-TAR
-BINPWD
-CAT
-LLVMAS
-LLC
-ANT
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-LLVMGCC
-LLVMGXX
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+LLVMGXX
+LLVMGCC
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+ANT
+LLC
+LLVMAS
+CAT
+BINPWD
+TAR
+SED
+RM
+RANLIB
+MV
+MKDIR
+FIND
+DATE
+CP
+CMP
+LN_S
+NM
+ac_ct_CXX
+CXXFLAGS
+CXX
+WITH_N3
+monopath
+WITH_N3_MONO
+pnetlibpath
+N3_LIB
+WITH_N3_PNETLIB
+pnetlocalprefix
+WITH_J3
+classpathversion
+classpathinclude
+classpathlibs
+classpathglibj
+EXCEPTION_FLAGS
+VM_FLAGS
+ISOLATE_BUILD
+SERVICE_BUILD
+SINGLE_BUILD
+GC_LIBS
+GC_FLAGS
+GC_SINGLE_MMAP
+GC_MULTI_MMAP
+GC_MMTK
+GC_BOEHM
+GC_MMAP2
+WITH_64
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+LLVM_FLAGS
+WITH_LLVM_GCC
+DYLIB_EXTENSION
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LLVM_OBJ
+LLVM_SRC
+VMKIT_COPYRIGHT
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_llvmsrc
+with_llvmobj
+with_llvmgcc
+with_thread
+with_finalizer
+with_gc
+with_vm_type
+with_exception_type
+with_gnu_classpath_libs
+with_gnu_classpath_glibj
+with_j3
+with_pnet_local_prefix
+with_pnetlib
+with_mono
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -753,6 +792,8 @@
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -851,13 +892,21 @@
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -870,13 +919,21 @@
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1067,22 +1124,38 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1102,7 +1175,7 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1111,16 +1184,16 @@
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1129,22 +1202,38 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1159,7 +1248,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1175,10 +1264,10 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1186,12 +1275,12 @@
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1218,12 +1307,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1272,9 +1361,9 @@
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1284,25 +1373,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/vmkit]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/vmkit]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1371,15 +1460,17 @@
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1415,7 +1506,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1425,10 +1516,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 vmkit configure 0.27svn
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1441,7 +1532,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by vmkit $as_me 0.27svn, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1477,7 +1568,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1512,7 +1603,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1564,11 +1655,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1598,9 +1690,9 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1615,9 +1707,9 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1633,8 +1725,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1676,21 +1768,24 @@
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1700,16 +1795,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1723,29 +1818,38 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1755,10 +1859,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1805,8 +1911,8 @@
 
 if test ${srcdir} != "." ; then
   if test -f ${srcdir}/include/mvm/Config/config.h ; then
-    { { echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5
-echo "$as_me: error: Already configured in ${srcdir}" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5
+$as_echo "$as_me: error: Already configured in ${srcdir}" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -1828,8 +1934,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $LLVM_SRC_ROOT/autoconf \"$srcdir\"/$LLVM_SRC_ROOT/autoconf" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $LLVM_SRC_ROOT/autoconf \"$srcdir\"/$LLVM_SRC_ROOT/autoconf" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $LLVM_SRC_ROOT/autoconf \"$srcdir\"/$LLVM_SRC_ROOT/autoconf" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in $LLVM_SRC_ROOT/autoconf \"$srcdir\"/$LLVM_SRC_ROOT/autoconf" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1871,34 +1977,34 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -1915,27 +2021,27 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -1952,27 +2058,27 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -1996,27 +2102,27 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
-{ echo "$as_me:$LINENO: checking type of operating system we're going to host on" >&5
-echo $ECHO_N "checking type of operating system we're going to host on... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking type of operating system we're going to host on" >&5
+$as_echo_n "checking type of operating system we're going to host on... " >&6; }
 if test "${vmkit_cv_os_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $host in
   *-*-aix*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="AIX"
     vmkit_cv_platform_type="Unix" ;;
   *-*-irix*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="IRIX"
     vmkit_cv_platform_type="Unix" ;;
   *-*-cygwin*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="Cygwin"
     vmkit_cv_platform_type="Unix" ;;
@@ -2025,32 +2131,32 @@
     vmkit_cv_os_type="Darwin"
     vmkit_cv_platform_type="Unix" ;;
   *-*-freebsd*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="FreeBSD"
     vmkit_cv_platform_type="Unix" ;;
   *-*-openbsd*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="OpenBSD"
     vmkit_cv_platform_type="Unix" ;;
   *-*-netbsd*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="NetBSD"
     vmkit_cv_platform_type="Unix" ;;
   *-*-hpux*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="HP-UX"
     vmkit_cv_platform_type="Unix" ;;
   *-*-interix*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="Interix"
     vmkit_cv_platform_type="Unix" ;;
@@ -2059,33 +2165,33 @@
     vmkit_cv_os_type="Linux"
     vmkit_cv_platform_type="Unix" ;;
   *-*-solaris*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="SunOS"
     vmkit_cv_platform_type="Unix" ;;
   *-*-win32*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="Win32"
     vmkit_cv_platform_type="Win32" ;;
   *-*-mingw*)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="MingW"
     vmkit_cv_platform_type="Win32" ;;
   *)
-    { { echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
-echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Good luck porting vmkit to your host!" >&5
+$as_echo "$as_me: error: Good luck porting vmkit to your host!" >&2;}
    { (exit 1); exit 1; }; }
     vmkit_cv_os_type="Unknown"
     vmkit_cv_platform_type="Unknown" ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $vmkit_cv_os_type" >&5
-echo "${ECHO_T}$vmkit_cv_os_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $vmkit_cv_os_type" >&5
+$as_echo "$vmkit_cv_os_type" >&6; }
 
 
 
@@ -2126,10 +2232,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2142,7 +2248,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2153,11 +2259,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2166,10 +2272,10 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2182,7 +2288,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2193,11 +2299,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2205,12 +2311,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2223,10 +2325,10 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2239,7 +2341,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2250,11 +2352,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2263,10 +2365,10 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2284,7 +2386,7 @@
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2307,11 +2409,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2322,10 +2424,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2338,7 +2440,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2349,11 +2451,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2366,10 +2468,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2382,7 +2484,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2393,11 +2495,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2409,12 +2511,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2424,44 +2522,50 @@
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2480,27 +2584,22 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2511,10 +2610,11 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2525,7 +2625,7 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2552,25 +2652,27 @@
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2579,49 +2681,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2630,31 +2736,33 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2677,40 +2785,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2736,20 +2847,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2759,15 +2871,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2794,20 +2910,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2832,20 +2949,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2871,20 +2989,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2899,8 +3018,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2916,10 +3035,10 @@
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2990,20 +3109,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3019,15 +3139,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3043,15 +3163,15 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3083,20 +3203,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3120,13 +3241,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3134,7 +3256,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3159,8 +3281,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3188,20 +3310,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3225,13 +3348,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3239,7 +3363,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3255,11 +3379,13 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -3269,42 +3395,37 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3319,74 +3440,60 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3401,40 +3508,31 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3461,20 +3559,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -3566,37 +3665,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3618,11 +3720,11 @@
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3640,20 +3742,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -3661,12 +3764,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3676,17 +3782,17 @@
 
 if test "x$thread" != "xno"; then
   if test "${ac_cv_header_pthread_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for pthread.h" >&5
-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
+$as_echo_n "checking for pthread.h... " >&6; }
 if test "${ac_cv_header_pthread_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+$as_echo "$ac_cv_header_pthread_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking pthread.h usability" >&5
-echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
+$as_echo_n "checking pthread.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3702,32 +3808,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking pthread.h presence" >&5
-echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5
+$as_echo_n "checking pthread.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3741,51 +3848,52 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## --------------------------------------- ##
 ## Report this to nicolas.geoffray at lip6.fr ##
@@ -3794,30 +3902,30 @@
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for pthread.h" >&5
-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
+$as_echo_n "checking for pthread.h... " >&6; }
 if test "${ac_cv_header_pthread_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_pthread_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+$as_echo "$ac_cv_header_pthread_h" >&6; }
 
 fi
-if test $ac_cv_header_pthread_h = yes; then
+if test "x$ac_cv_header_pthread_h" = x""yes; then
   :
 else
-  { echo "$as_me:$LINENO: WARNING: phtread include NOT found" >&5
-echo "$as_me: WARNING: phtread include NOT found" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: phtread include NOT found" >&5
+$as_echo "$as_me: WARNING: phtread include NOT found" >&2;}
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -3849,33 +3957,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -3883,8 +3995,8 @@
   LIBS="-lpthread $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: pthread library not found" >&5
-echo "$as_me: error: pthread library not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: pthread library not found" >&5
+$as_echo "$as_me: error: pthread library not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -4192,15 +4304,15 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4232,20 +4344,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4269,13 +4382,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4283,7 +4397,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4308,8 +4422,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4337,20 +4451,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4374,13 +4489,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4388,7 +4504,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4404,11 +4520,13 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -4427,10 +4545,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4443,7 +4561,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4454,11 +4572,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4471,10 +4589,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -4487,7 +4605,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4498,11 +4616,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4514,12 +4632,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4527,50 +4641,56 @@
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4596,20 +4716,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -4619,15 +4740,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -4654,20 +4779,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -4692,20 +4818,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -4731,20 +4858,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4759,8 +4887,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -4776,10 +4904,10 @@
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -4850,20 +4978,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4879,15 +5008,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -4911,10 +5040,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -4927,7 +5056,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4938,11 +5067,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4955,10 +5084,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -4971,7 +5100,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4982,11 +5111,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4998,12 +5127,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -5013,43 +5138,47 @@
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5075,20 +5204,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -5098,15 +5228,19 @@
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -5133,20 +5267,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -5171,20 +5306,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -5210,20 +5346,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -5238,8 +5375,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -5262,10 +5399,10 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -5311,29 +5448,29 @@
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
 
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 # Extract the first word of "cmp", so it can be a program name with args.
 set dummy cmp; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CMP in
   [\\/]* | ?:[\\/]*)
@@ -5348,7 +5485,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5361,20 +5498,20 @@
 fi
 CMP=$ac_cv_path_CMP
 if test -n "$CMP"; then
-  { echo "$as_me:$LINENO: result: $CMP" >&5
-echo "${ECHO_T}$CMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CMP" >&5
+$as_echo "$CMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CP in
   [\\/]* | ?:[\\/]*)
@@ -5389,7 +5526,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5402,20 +5539,20 @@
 fi
 CP=$ac_cv_path_CP
 if test -n "$CP"; then
-  { echo "$as_me:$LINENO: result: $CP" >&5
-echo "${ECHO_T}$CP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CP" >&5
+$as_echo "$CP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "date", so it can be a program name with args.
 set dummy date; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DATE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DATE in
   [\\/]* | ?:[\\/]*)
@@ -5430,7 +5567,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5443,20 +5580,20 @@
 fi
 DATE=$ac_cv_path_DATE
 if test -n "$DATE"; then
-  { echo "$as_me:$LINENO: result: $DATE" >&5
-echo "${ECHO_T}$DATE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DATE" >&5
+$as_echo "$DATE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_FIND+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $FIND in
   [\\/]* | ?:[\\/]*)
@@ -5471,7 +5608,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5484,20 +5621,20 @@
 fi
 FIND=$ac_cv_path_FIND
 if test -n "$FIND"; then
-  { echo "$as_me:$LINENO: result: $FIND" >&5
-echo "${ECHO_T}$FIND" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $FIND" >&5
+$as_echo "$FIND" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "grep", so it can be a program name with args.
 set dummy grep; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GREP in
   [\\/]* | ?:[\\/]*)
@@ -5512,7 +5649,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5525,20 +5662,20 @@
 fi
 GREP=$ac_cv_path_GREP
 if test -n "$GREP"; then
-  { echo "$as_me:$LINENO: result: $GREP" >&5
-echo "${ECHO_T}$GREP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GREP" >&5
+$as_echo "$GREP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "mkdir", so it can be a program name with args.
 set dummy mkdir; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MKDIR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MKDIR in
   [\\/]* | ?:[\\/]*)
@@ -5553,7 +5690,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5566,20 +5703,20 @@
 fi
 MKDIR=$ac_cv_path_MKDIR
 if test -n "$MKDIR"; then
-  { echo "$as_me:$LINENO: result: $MKDIR" >&5
-echo "${ECHO_T}$MKDIR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MKDIR" >&5
+$as_echo "$MKDIR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MV+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MV in
   [\\/]* | ?:[\\/]*)
@@ -5594,7 +5731,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5607,21 +5744,21 @@
 fi
 MV=$ac_cv_path_MV
 if test -n "$MV"; then
-  { echo "$as_me:$LINENO: result: $MV" >&5
-echo "${ECHO_T}$MV" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MV" >&5
+$as_echo "$MV" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5634,7 +5771,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5645,11 +5782,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5658,10 +5795,10 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5674,7 +5811,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5685,11 +5822,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5697,12 +5834,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5713,10 +5846,10 @@
 
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_RM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $RM in
   [\\/]* | ?:[\\/]*)
@@ -5731,7 +5864,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5744,20 +5877,20 @@
 fi
 RM=$ac_cv_path_RM
 if test -n "$RM"; then
-  { echo "$as_me:$LINENO: result: $RM" >&5
-echo "${ECHO_T}$RM" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RM" >&5
+$as_echo "$RM" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $SED in
   [\\/]* | ?:[\\/]*)
@@ -5772,7 +5905,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5785,20 +5918,20 @@
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TAR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TAR in
   [\\/]* | ?:[\\/]*)
@@ -5813,7 +5946,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5826,20 +5959,20 @@
 fi
 TAR=$ac_cv_path_TAR
 if test -n "$TAR"; then
-  { echo "$as_me:$LINENO: result: $TAR" >&5
-echo "${ECHO_T}$TAR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TAR" >&5
+$as_echo "$TAR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "pwd", so it can be a program name with args.
 set dummy pwd; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_BINPWD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $BINPWD in
   [\\/]* | ?:[\\/]*)
@@ -5854,7 +5987,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_BINPWD="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5867,20 +6000,20 @@
 fi
 BINPWD=$ac_cv_path_BINPWD
 if test -n "$BINPWD"; then
-  { echo "$as_me:$LINENO: result: $BINPWD" >&5
-echo "${ECHO_T}$BINPWD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $BINPWD" >&5
+$as_echo "$BINPWD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "cat", so it can be a program name with args.
 set dummy cat; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CAT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CAT in
   [\\/]* | ?:[\\/]*)
@@ -5895,7 +6028,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5908,21 +6041,21 @@
 fi
 CAT=$ac_cv_path_CAT
 if test -n "$CAT"; then
-  { echo "$as_me:$LINENO: result: $CAT" >&5
-echo "${ECHO_T}$CAT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CAT" >&5
+$as_echo "$CAT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 # Extract the first word of "llvm-as", so it can be a program name with args.
 set dummy llvm-as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_LLVMAS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $LLVMAS in
   [\\/]* | ?:[\\/]*)
@@ -5937,7 +6070,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LLVMAS="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5950,20 +6083,20 @@
 fi
 LLVMAS=$ac_cv_path_LLVMAS
 if test -n "$LLVMAS"; then
-  { echo "$as_me:$LINENO: result: $LLVMAS" >&5
-echo "${ECHO_T}$LLVMAS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LLVMAS" >&5
+$as_echo "$LLVMAS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "llc", so it can be a program name with args.
 set dummy llc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_LLC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $LLC in
   [\\/]* | ?:[\\/]*)
@@ -5978,7 +6111,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LLC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5991,20 +6124,20 @@
 fi
 LLC=$ac_cv_path_LLC
 if test -n "$LLC"; then
-  { echo "$as_me:$LINENO: result: $LLC" >&5
-echo "${ECHO_T}$LLC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LLC" >&5
+$as_echo "$LLC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "ant", so it can be a program name with args.
 set dummy ant; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_ANT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -6019,7 +6152,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6031,11 +6164,11 @@
 fi
 ANT=$ac_cv_path_ANT
 if test -n "$ANT"; then
-  { echo "$as_me:$LINENO: result: $ANT" >&5
-echo "${ECHO_T}$ANT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ANT" >&5
+$as_echo "$ANT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6053,11 +6186,12 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6086,17 +6220,29 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -6109,8 +6255,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -6126,10 +6272,10 @@
   LLVMGXX="llvm-g++${EXEEXT}"
   # Extract the first word of "$LLVMGCC", so it can be a program name with args.
 set dummy $LLVMGCC; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_LLVMGCC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $LLVMGCC in
   [\\/]* | ?:[\\/]*)
@@ -6144,7 +6290,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6156,20 +6302,20 @@
 fi
 LLVMGCC=$ac_cv_path_LLVMGCC
 if test -n "$LLVMGCC"; then
-  { echo "$as_me:$LINENO: result: $LLVMGCC" >&5
-echo "${ECHO_T}$LLVMGCC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LLVMGCC" >&5
+$as_echo "$LLVMGCC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   # Extract the first word of "$LLVMGXX", so it can be a program name with args.
 set dummy $LLVMGXX; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_LLVMGXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $LLVMGXX in
   [\\/]* | ?:[\\/]*)
@@ -6184,7 +6330,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6196,11 +6342,11 @@
 fi
 LLVMGXX=$ac_cv_path_LLVMGXX
 if test -n "$LLVMGXX"; then
-  { echo "$as_me:$LINENO: result: $LLVMGXX" >&5
-echo "${ECHO_T}$LLVMGXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LLVMGXX" >&5
+$as_echo "$LLVMGXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6217,8 +6363,8 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking tool compatibility" >&5
-echo $ECHO_N "checking tool compatibility... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking tool compatibility" >&5
+$as_echo_n "checking tool compatibility... " >&6; }
 
 ICC=no
 IXX=no
@@ -6233,15 +6379,15 @@
 
 if test "$GCC" != "yes" && test "$ICC" != "yes"
 then
-  { { echo "$as_me:$LINENO: error: gcc|icc required but not found" >&5
-echo "$as_me: error: gcc|icc required but not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: gcc|icc required but not found" >&5
+$as_echo "$as_me: error: gcc|icc required but not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "$GXX" != "yes" && test "$IXX" != "yes"
 then
-  { { echo "$as_me:$LINENO: error: g++|icc required but not found" >&5
-echo "$as_me: error: g++|icc required but not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: g++|icc required but not found" >&5
+$as_echo "$as_me: error: g++|icc required but not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -6259,40 +6405,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ { echo "$as_me:$LINENO: error: gcc 3.x required, but you have a lower version" >&5
-echo "$as_me: error: gcc 3.x required, but you have a lower version" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: gcc 3.x required, but you have a lower version" >&5
+$as_echo "$as_me: error: gcc 3.x required, but you have a lower version" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-{ echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 
 
 
 
-{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
 if test "${ac_cv_lib_z_inflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -6324,33 +6471,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_inflate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_inflate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
-if test $ac_cv_lib_z_inflate = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
+$as_echo "$ac_cv_lib_z_inflate" >&6; }
+if test "x$ac_cv_lib_z_inflate" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -6359,8 +6510,8 @@
 
 else
   \
-  { { echo "$as_me:$LINENO: error: You need to install the zlib package (z)." >&5
-echo "$as_me: error: You need to install the zlib package (z)." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: You need to install the zlib package (z)." >&5
+$as_echo "$as_me: error: You need to install the zlib package (z)." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -6368,10 +6519,10 @@
 
 if test "x$gc" = "xboehm";  then
 
-{ echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5
-echo $ECHO_N "checking for GC_malloc in -lgc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5
+$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
 if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgc  $LIBS"
@@ -6403,33 +6554,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_gc_GC_malloc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_gc_GC_malloc=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_malloc" >&5
-echo "${ECHO_T}$ac_cv_lib_gc_GC_malloc" >&6; }
-if test $ac_cv_lib_gc_GC_malloc = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_malloc" >&5
+$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
+if test "x$ac_cv_lib_gc_GC_malloc" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGC 1
 _ACEOF
@@ -6438,8 +6593,8 @@
 
 else
   \
-    { { echo "$as_me:$LINENO: error: You need to install the boehm-gc package (gc)." >&5
-echo "$as_me: error: You need to install the boehm-gc package (gc)." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: You need to install the boehm-gc package (gc)." >&5
+$as_echo "$as_me: error: You need to install the boehm-gc package (gc)." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -6448,17 +6603,17 @@
 
 
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
+$as_echo_n "checking zlib.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6474,32 +6629,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
+$as_echo_n "checking zlib.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6513,51 +6669,52 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## --------------------------------------- ##
 ## Report this to nicolas.geoffray at lip6.fr ##
@@ -6566,23 +6723,23 @@
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_zlib_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
 
 fi
-if test $ac_cv_header_zlib_h = yes; then
+if test "x$ac_cv_header_zlib_h" = x""yes; then
   :
 else
   \
-  { { echo "$as_me:$LINENO: error: You need to install the zlib devel package (zlib.h)." >&5
-echo "$as_me: error: You need to install the zlib devel package (zlib.h)." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: You need to install the zlib devel package (zlib.h)." >&5
+$as_echo "$as_me: error: You need to install the zlib devel package (zlib.h)." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -6591,17 +6748,17 @@
 
 if test "x$gc" = "xboehm";  then
   if test "${ac_cv_header_gc_gc_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for gc/gc.h" >&5
-echo $ECHO_N "checking for gc/gc.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gc/gc.h" >&5
+$as_echo_n "checking for gc/gc.h... " >&6; }
 if test "${ac_cv_header_gc_gc_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gc_gc_h" >&5
-echo "${ECHO_T}$ac_cv_header_gc_gc_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gc_gc_h" >&5
+$as_echo "$ac_cv_header_gc_gc_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking gc/gc.h usability" >&5
-echo $ECHO_N "checking gc/gc.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking gc/gc.h usability" >&5
+$as_echo_n "checking gc/gc.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6617,32 +6774,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking gc/gc.h presence" >&5
-echo $ECHO_N "checking gc/gc.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking gc/gc.h presence" >&5
+$as_echo_n "checking gc/gc.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6656,51 +6814,52 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: gc/gc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: gc/gc.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: gc/gc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: gc/gc.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: gc/gc.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: gc/gc.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: gc/gc.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: gc/gc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: gc/gc.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gc/gc.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: gc/gc.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: gc/gc.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: gc/gc.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: gc/gc.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: gc/gc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: gc/gc.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gc/gc.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: gc/gc.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## --------------------------------------- ##
 ## Report this to nicolas.geoffray at lip6.fr ##
@@ -6709,53 +6868,155 @@
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for gc/gc.h" >&5
-echo $ECHO_N "checking for gc/gc.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for gc/gc.h" >&5
+$as_echo_n "checking for gc/gc.h... " >&6; }
 if test "${ac_cv_header_gc_gc_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_gc_gc_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gc_gc_h" >&5
-echo "${ECHO_T}$ac_cv_header_gc_gc_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gc_gc_h" >&5
+$as_echo "$ac_cv_header_gc_gc_h" >&6; }
 
 fi
-if test $ac_cv_header_gc_gc_h = yes; then
+if test "x$ac_cv_header_gc_gc_h" = x""yes; then
   :
 else
   \
-    { { echo "$as_me:$LINENO: error: You need to install the boehm-gc devel package (gc/gc.h)." >&5
-echo "$as_me: error: You need to install the boehm-gc devel package (gc/gc.h)." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: You need to install the boehm-gc devel package (gc/gc.h)." >&5
+$as_echo "$as_me: error: You need to install the boehm-gc devel package (gc/gc.h)." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 
-
+
+fi
+
+
+nl===-----------------------------------------------------------------------===
+
+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+$as_echo_n "checking for pid_t... " >&6; }
+if test "${ac_cv_type_pid_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_pid_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (pid_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((pid_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_pid_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+$as_echo "$ac_cv_type_pid_t" >&6; }
+if test "x$ac_cv_type_pid_t" = x""yes; then
+  :
+else
 
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
 
-nl===-----------------------------------------------------------------------===
+fi
 
-{ echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef pid_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
@@ -6766,44 +7027,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_pid_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
-if test $ac_cv_type_pid_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6811,14 +7046,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -6829,30 +7061,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -6862,10 +7103,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
 if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6881,7 +7122,7 @@
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
- 				     return !p;
+				     return !p;
   ;
   return 0;
 }
@@ -6892,20 +7133,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_struct_tm=sys/time.h
@@ -6913,8 +7155,8 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6923,26 +7165,58 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for int64_t" >&5
-echo $ECHO_N "checking for int64_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
+$as_echo_n "checking for int64_t... " >&6; }
 if test "${ac_cv_type_int64_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_int64_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef int64_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (int64_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((int64_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -6953,30 +7227,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_int64_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_int64_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_int64_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
-echo "${ECHO_T}$ac_cv_type_int64_t" >&6; }
-if test $ac_cv_type_int64_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
+$as_echo "$ac_cv_type_int64_t" >&6; }
+if test "x$ac_cv_type_int64_t" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_INT64_T 1
@@ -6984,31 +7267,63 @@
 
 
 else
-  { { echo "$as_me:$LINENO: error: Type int64_t required but not found" >&5
-echo "$as_me: error: Type int64_t required but not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Type int64_t required but not found" >&5
+$as_echo "$as_me: error: Type int64_t required but not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ echo "$as_me:$LINENO: checking for uint64_t" >&5
-echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5
+$as_echo_n "checking for uint64_t... " >&6; }
 if test "${ac_cv_type_uint64_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_uint64_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef uint64_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (uint64_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((uint64_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -7019,30 +7334,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint64_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_uint64_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_uint64_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; }
-if test $ac_cv_type_uint64_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
+$as_echo "$ac_cv_type_uint64_t" >&6; }
+if test "x$ac_cv_type_uint64_t" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UINT64_T 1
@@ -7050,26 +7374,58 @@
 
 
 else
-  { echo "$as_me:$LINENO: checking for u_int64_t" >&5
-echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for u_int64_t" >&5
+$as_echo_n "checking for u_int64_t... " >&6; }
 if test "${ac_cv_type_u_int64_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_u_int64_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef u_int64_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (u_int64_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((u_int64_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -7080,30 +7436,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_u_int64_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_u_int64_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_u_int64_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6; }
-if test $ac_cv_type_u_int64_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5
+$as_echo "$ac_cv_type_u_int64_t" >&6; }
+if test "x$ac_cv_type_u_int64_t" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT64_T 1
@@ -7111,8 +7476,8 @@
 
 
 else
-  { { echo "$as_me:$LINENO: error: Type uint64_t or u_int64_t required but not found" >&5
-echo "$as_me: error: Type uint64_t or u_int64_t required but not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Type uint64_t or u_int64_t required but not found" >&5
+$as_echo "$as_me: error: Type uint64_t or u_int64_t required but not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -7124,11 +7489,11 @@
 
 for ac_func in setjmp longjmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7181,35 +7546,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7272,11 +7644,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -7309,12 +7682,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -7330,7 +7703,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -7343,11 +7716,12 @@
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -7360,7 +7734,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -7370,7 +7744,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -7392,17 +7766,45 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -7418,8 +7820,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -7442,7 +7842,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -7455,17 +7855,10 @@
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -7487,7 +7880,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -7538,7 +7931,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -7566,7 +7959,6 @@
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -7579,19 +7971,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -7616,10 +8011,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -7642,7 +8037,7 @@
 # values after options handling.
 ac_log="
 This file was extended by vmkit $as_me 0.27svn, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -7655,30 +8050,40 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
+config_commands="`echo $ac_config_commands`"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -7692,24 +8097,24 @@
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 vmkit config.status 0.27svn
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -7731,30 +8136,36 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -7773,27 +8184,29 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -7801,7 +8214,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -7818,8 +8231,8 @@
     "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
     "lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -7860,222 +8273,143 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-VMKIT_COPYRIGHT!$VMKIT_COPYRIGHT$ac_delim
-LLVM_SRC!$LLVM_SRC$ac_delim
-LLVM_OBJ!$LLVM_OBJ$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-DYLIB_EXTENSION!$DYLIB_EXTENSION$ac_delim
-WITH_LLVM_GCC!$WITH_LLVM_GCC$ac_delim
-LLVM_FLAGS!$LLVM_FLAGS$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-WITH_64!$WITH_64$ac_delim
-GC_MMAP2!$GC_MMAP2$ac_delim
-GC_BOEHM!$GC_BOEHM$ac_delim
-GC_MMTK!$GC_MMTK$ac_delim
-GC_MULTI_MMAP!$GC_MULTI_MMAP$ac_delim
-GC_SINGLE_MMAP!$GC_SINGLE_MMAP$ac_delim
-GC_FLAGS!$GC_FLAGS$ac_delim
-GC_LIBS!$GC_LIBS$ac_delim
-SINGLE_BUILD!$SINGLE_BUILD$ac_delim
-SERVICE_BUILD!$SERVICE_BUILD$ac_delim
-ISOLATE_BUILD!$ISOLATE_BUILD$ac_delim
-VM_FLAGS!$VM_FLAGS$ac_delim
-EXCEPTION_FLAGS!$EXCEPTION_FLAGS$ac_delim
-classpathglibj!$classpathglibj$ac_delim
-classpathlibs!$classpathlibs$ac_delim
-classpathinclude!$classpathinclude$ac_delim
-classpathversion!$classpathversion$ac_delim
-WITH_J3!$WITH_J3$ac_delim
-pnetlocalprefix!$pnetlocalprefix$ac_delim
-WITH_N3_PNETLIB!$WITH_N3_PNETLIB$ac_delim
-N3_LIB!$N3_LIB$ac_delim
-pnetlibpath!$pnetlibpath$ac_delim
-WITH_N3_MONO!$WITH_N3_MONO$ac_delim
-monopath!$monopath$ac_delim
-WITH_N3!$WITH_N3$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-NM!$NM$ac_delim
-LN_S!$LN_S$ac_delim
-CMP!$CMP$ac_delim
-CP!$CP$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-DATE!$DATE$ac_delim
-FIND!$FIND$ac_delim
-MKDIR!$MKDIR$ac_delim
-MV!$MV$ac_delim
-RANLIB!$RANLIB$ac_delim
-RM!$RM$ac_delim
-SED!$SED$ac_delim
-TAR!$TAR$ac_delim
-BINPWD!$BINPWD$ac_delim
-CAT!$CAT$ac_delim
-LLVMAS!$LLVMAS$ac_delim
-LLC!$LLC$ac_delim
-ANT!$ANT$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LLVMGCC!$LLVMGCC$ac_delim
-LLVMGXX!$LLVMGXX$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -8092,19 +8426,133 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -8133,26 +8581,38 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -8162,7 +8622,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -8188,7 +8648,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -8197,7 +8657,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -8218,17 +8678,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -8268,12 +8728,13 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -8282,13 +8743,14 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -8302,15 +8764,16 @@
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -8320,123 +8783,62 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -8456,6 +8858,11 @@
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -8477,4 +8884,8 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 

Modified: vmkit/trunk/include/mvm/Config/config.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Config/config.h.in?rev=91567&r1=91566&r2=91567&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/Config/config.h.in (original)
+++ vmkit/trunk/include/mvm/Config/config.h.in Wed Dec 16 15:23:52 2009
@@ -88,7 +88,7 @@
 #undef WITH_N3
 
 /* Compiling JNJVM */
-#undef WITH_JNJVM
+#undef WITH_J3
 
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t

Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=91567&r1=91566&r2=91567&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Dec 16 15:23:52 2009
@@ -140,7 +140,7 @@
   mvm::Collector::initialise();
 
   if (VMToRun == RunJava) {
-#if WITH_JNJVM
+#if WITH_J3
     JavaJITCompiler* Comp = new JavaJITCompiler("JITModule");
     JnjvmClassLoader* JCL = mvm::VirtualMachine::initialiseJVM(Comp);
     addCommandLinePass(argv);
@@ -157,7 +157,7 @@
 #endif
   } else {
     mvm::CommandLine MyCl;
-#if WITH_JNJVM
+#if WITH_J3
     JavaJITCompiler* Comp = new JavaJITCompiler("JITModule");
     JnjvmClassLoader* JCL = mvm::VirtualMachine::initialiseJVM(Comp);
     addCommandLinePass(argv);




From nicolas.geoffray at lip6.fr  Wed Dec 16 13:30:45 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 16 Dec 2009 21:30:45 -0000
Subject: [vmkit-commits] [vmkit] r91568 - in /vmkit/trunk: include/j3/
 include/mvm/ lib/J3/Classpath/ lib/J3/Compiler/ lib/J3/LLVMRuntime/
 lib/J3/VMCore/ tools/j3/ tools/vmjc/ tools/vmkit/
Message-ID: <200912162130.nBGLUlVI032304@zion.cs.uiuc.edu>

Author: geoffray
Date: Wed Dec 16 15:30:44 2009
New Revision: 91568

URL: http://llvm.org/viewvc/llvm-project?rev=91568&view=rev
Log:
Change namespace jnjvm to j3.


Modified:
    vmkit/trunk/include/j3/JavaCompiler.h
    vmkit/trunk/include/j3/JnjvmModule.h
    vmkit/trunk/include/j3/JnjvmModuleProvider.h
    vmkit/trunk/include/j3/OpcodeNames.def
    vmkit/trunk/include/mvm/VirtualMachine.h
    vmkit/trunk/lib/J3/Classpath/Classpath.h.in
    vmkit/trunk/lib/J3/Classpath/Classpath.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
    vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc
    vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc
    vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
    vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
    vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJIT.h
    vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
    vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
    vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
    vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll
    vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll
    vmkit/trunk/lib/J3/VMCore/JNIReferences.h
    vmkit/trunk/lib/J3/VMCore/JavaAccess.h
    vmkit/trunk/lib/J3/VMCore/JavaArray.cpp
    vmkit/trunk/lib/J3/VMCore/JavaArray.h
    vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/J3/VMCore/JavaClass.h
    vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
    vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h
    vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
    vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp
    vmkit/trunk/lib/J3/VMCore/JavaLocks.h
    vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp
    vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
    vmkit/trunk/lib/J3/VMCore/JavaObject.h
    vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/J3/VMCore/JavaString.cpp
    vmkit/trunk/lib/J3/VMCore/JavaString.h
    vmkit/trunk/lib/J3/VMCore/JavaThread.cpp
    vmkit/trunk/lib/J3/VMCore/JavaThread.h
    vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
    vmkit/trunk/lib/J3/VMCore/JavaTypes.h
    vmkit/trunk/lib/J3/VMCore/Jni.cpp
    vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/J3/VMCore/Jnjvm.h
    vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
    vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
    vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h
    vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h
    vmkit/trunk/lib/J3/VMCore/LockedMap.cpp
    vmkit/trunk/lib/J3/VMCore/LockedMap.h
    vmkit/trunk/lib/J3/VMCore/Reader.cpp
    vmkit/trunk/lib/J3/VMCore/Reader.h
    vmkit/trunk/lib/J3/VMCore/UTF8.h
    vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp
    vmkit/trunk/lib/J3/VMCore/Zip.cpp
    vmkit/trunk/lib/J3/VMCore/Zip.h
    vmkit/trunk/tools/j3/Main.cpp
    vmkit/trunk/tools/vmjc/vmjc.cpp
    vmkit/trunk/tools/vmkit/CommandLine.cpp
    vmkit/trunk/tools/vmkit/CommandLine.h
    vmkit/trunk/tools/vmkit/Launcher.cpp

Modified: vmkit/trunk/include/j3/JavaCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaCompiler.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/include/j3/JavaCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaCompiler.h Wed Dec 16 15:30:44 2009
@@ -1,4 +1,4 @@
-//===------- JavaCompiler.h - Jnjvm interface for the compiler ------------===//
+//===---------- JavaCompiler.h - J3 interface for the compiler ------------===//
 //
 //                           The VMKit project
 //
@@ -21,7 +21,7 @@
   class UTF8;
 }
 
-namespace jnjvm {
+namespace j3 {
 
 class Class;
 class CommonClass;

Modified: vmkit/trunk/include/j3/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JnjvmModule.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/include/j3/JnjvmModule.h (original)
+++ vmkit/trunk/include/j3/JnjvmModule.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
-//===------- JnjvmModule.h - Definition of a Jnjvm module -----------------===//
+//===---------- JnjvmModule.h - Definition of a J3 module -----------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -33,7 +33,7 @@
   class Value;
 }
 
-namespace jnjvm {
+namespace j3 {
 
 class ArrayObject;
 class Attribut;

Modified: vmkit/trunk/include/j3/JnjvmModuleProvider.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JnjvmModuleProvider.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/include/j3/JnjvmModuleProvider.h (original)
+++ vmkit/trunk/include/j3/JnjvmModuleProvider.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
-//===----- JnjvmModuleProvider.h - LLVM Module Provider for Jnjvm ---------===//
+//===-------- JnjvmModuleProvider.h - LLVM Module Provider for J3 ---------===//
 //
-//                              Jnjvm
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -12,7 +12,7 @@
 
 #include <llvm/ModuleProvider.h>
 
-namespace jnjvm {
+namespace j3 {
 
 class JavaJITCompiler;
 
@@ -31,6 +31,6 @@
   }
 };
 
-} // End jnjvm namespace
+} // End j3 namespace
 
 #endif

Modified: vmkit/trunk/include/j3/OpcodeNames.def
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/OpcodeNames.def?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/include/j3/OpcodeNames.def (original)
+++ vmkit/trunk/include/j3/OpcodeNames.def Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------------- OpcodeNames.def - Name of opcodes ---------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.

Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Wed Dec 16 15:30:44 2009
@@ -25,7 +25,7 @@
 #include <cassert>
 #include <map>
 
-namespace jnjvm {
+namespace j3 {
   class JavaCompiler;
   class JnjvmClassLoader;
 }
@@ -269,9 +269,9 @@
   /// waitForExit - Wait until the virtual machine stops its execution.
   virtual void waitForExit() = 0;
 
-  static jnjvm::JnjvmClassLoader* initialiseJVM(jnjvm::JavaCompiler* C,
+  static j3::JnjvmClassLoader* initialiseJVM(j3::JavaCompiler* C,
                                                 bool dlLoad = true);
-  static VirtualMachine* createJVM(jnjvm::JnjvmClassLoader* C = 0);
+  static VirtualMachine* createJVM(j3::JnjvmClassLoader* C = 0);
   
   static CompilationUnit* initialiseCLIVM();
   static VirtualMachine* createCLIVM(CompilationUnit* C = 0);

Modified: vmkit/trunk/lib/J3/Classpath/Classpath.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/Classpath.h.in?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/Classpath.h.in (original)
+++ vmkit/trunk/lib/J3/Classpath/Classpath.h.in Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------- Classpath.h - Configuration for classpath -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.

Modified: vmkit/trunk/lib/J3/Classpath/Classpath.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/Classpath.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/Classpath.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/Classpath.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------- Classpath.cpp - Configuration for classpath -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
 #include "Jnjvm.h"
 
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
 //===- ClasspathConstructor.cpp -------------------------------------------===//
 //===----------- GNU classpath java/lang/reflect/Constructor --------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 #include "Jnjvm.h"
 #include "JnjvmClassLoader.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathField.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathField.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathField.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===- ClasspathVMField.cpp - GNU classpath java/lang/reflect/Field -------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
 //===- ClasspathMethod.cpp ------------------------------------------------===//
 //===------------- GNU classpath java/lang/reflect/Method -----------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 #include "Jnjvm.h"
 #include "JnjvmClassLoader.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h Wed Dec 16 15:30:44 2009
@@ -2,7 +2,7 @@
 // java/lang/Class, java/lang/reflect/Field, java/lang/reflect/Method and ----//
 // java/lang/reflect/Constructor as compiled by JnJVM. -----------------------//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -17,9 +17,9 @@
 #include <JavaClass.h>
 #include <JavaObject.h>
 
-extern "C" jnjvm::JavaObject* internalFillInStackTrace(jnjvm::JavaObject*);
+extern "C" j3::JavaObject* internalFillInStackTrace(j3::JavaObject*);
 
-namespace jnjvm {
+namespace j3 {
 
 class JavaObjectClass : public JavaObject {
 public:

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---- ClasspathVMClass.cpp - GNU classpath java/lang/VMClass ----------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===- ClasspathVMClassLoader.cpp - GNU classpath java/lang/VMClassLoader -===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
 #include "Jnjvm.h"
 #include "Reader.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===------ ClasspathVMObject.cpp - GNU classpath java/lang/VMObject ------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
 #include "JavaThread.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===------ ClasspathVMRuntime.cpp - GNU classpath java/lang/VMRuntime ----===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -25,7 +25,7 @@
 #include <cstring>
 #include <unistd.h>
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 
@@ -81,8 +81,8 @@
 #endif
 
 typedef int (*onLoad_t)(const void**, void*);
-extern "C" void  jnjvmEndJNI(uint32** old, void** oldBuf);
-extern "C" void  jnjvmStartJNI(uint32* num, uint32** old, void* newBuf,
+extern "C" void  j3EndJNI(uint32** old, void** oldBuf);
+extern "C" void  j3StartJNI(uint32* num, uint32** old, void* newBuf,
                                void** oldBuf, mvm::KnownFrame* Frame);
 
 extern "C" void callOnLoad(void* res, JnjvmClassLoader* loader, Jnjvm* vm)
@@ -103,11 +103,11 @@
     if (setjmp(buf) == 0) {
       // Push an unmeaningful value in the addresses field to let the
       // stack consistent with Java frames/native frames.
-      jnjvmStartJNI(&num, &old, (void*)&buf, &oldBuf, &Frame);
+      j3StartJNI(&num, &old, (void*)&buf, &oldBuf, &Frame);
       onLoad(&vm->javavmEnv, res);
     }
 
-    jnjvmEndJNI(&old, &oldBuf);
+    j3EndJNI(&old, &oldBuf);
   }
 }
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
 //===- ClasspathVMStackWalker.cpp -----------------------------------------===//
 //===------------ GNU classpath gnu/classpath/VMStackWalker ---------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-- ClasspathVMSystem.cpp - GNU classpath java/lang/VMSystem ----------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
 #include "JavaThread.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 
@@ -38,7 +38,7 @@
 
   BEGIN_NATIVE_EXCEPTION(0)
 
-  jnjvm::Jnjvm *vm = JavaThread::get()->getJVM();
+  j3::Jnjvm *vm = JavaThread::get()->getJVM();
 
   verifyNull(src);
   verifyNull(dst);

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
 //===- ClasspathVMSystem/Properties.cpp -----------------------------------===//
 //===--------------------- GNU classpath gnu/classpath/VMSystemProperties -===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -20,7 +20,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===- ClasspathVMThread.cpp - GNU classpath java/lang/VMThread -----------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 
@@ -43,9 +43,9 @@
   // which is the JavaThread object.
   JavaField* field = vm->upcalls->vmdataVMThread;
   vmThread = thread->vmThread;
-  assert(vmThread && "Didn't fix the vmThread of a jnjvm thread");
+  assert(vmThread && "Didn't fix the vmThread of a j3 thread");
   JavaObject* javaThread = thread->javaThread;
-  assert(javaThread && "Didn't fix the javaThread of a jnjvm thread");
+  assert(javaThread && "Didn't fix the javaThread of a j3 thread");
   field->setObjectField(vmThread, (JavaObject*)(void*)thread);
   
   UserClass* vmthClass = (UserClass*)vmThread->getClass();

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===- ClasspathVMClassLoader.cpp - GNU classpath java/lang/VMClassLoader -===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 #include "Jnjvm.h"
 #include "Reader.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" {
 

Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------- JavaUpcalls.cpp - Upcalls to Java entities ------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -28,7 +28,7 @@
   }
 
 
-using namespace jnjvm;
+using namespace j3;
 
 #ifndef ISOLATE_SHARING
 Class*      Classpath::newThread;

Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---------- JavaUpcalls.h - Upcalls to Java entities ------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -51,7 +51,7 @@
                                      loader->asciizConstructUTF8("(Ljava/lang/Throwable;)V"), \
                                      false, false, 0);
 
-namespace jnjvm {
+namespace j3 {
 
 class Jnjvm;
 class JavaField;
@@ -270,6 +270,6 @@
 };
 
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JITInfo.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JITInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JITInfo.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------- JnjvmModule.cpp - Definition of a Jnjvm module -------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -33,7 +33,7 @@
 
 #include <cstdio>
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 const Type* LLVMClassInfo::getVirtualType() {
@@ -148,13 +148,13 @@
       char* buf = (char*)alloca(3 + JNI_NAME_PRE_LEN + 1 +
                                 ((mnlen + clen + mtlen) << 3));
       
-      bool jnjvm = false;
+      bool j3 = false;
       if (isNative(methodDef->access)) {
         // Verify if it's defined by JnJVM
-        JCL->nativeLookup(methodDef, jnjvm, buf);
+        JCL->nativeLookup(methodDef, j3, buf);
       }
 
-      if (!jnjvm) {
+      if (!j3) {
         methodDef->jniConsFromMethOverloaded(buf + 1);
         memcpy(buf, "JnJVM", 5);
       }

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----- JavaAOTCompiler.cpp - Support for Ahead of Time Compiler --------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -32,7 +32,7 @@
 
 #include <cstdio>
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 bool JavaAOTCompiler::isCompiling(const CommonClass* cl) const {
@@ -1578,7 +1578,7 @@
   llvm::FunctionPass* createEscapeAnalysisPass(llvm::Function*);
 }
 
-namespace jnjvm {
+namespace j3 {
   llvm::FunctionPass* createLowerConstantCallsPass();
 }
 

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------- JavaJIT.cpp - Java just in time compiler -----------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -40,7 +40,7 @@
 #include "j3/JnjvmModule.h"
 #include "j3/JnjvmModuleProvider.h"
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 static bool needsInitialisationCheck(Class* cl, Class* compilingClass) {
@@ -230,7 +230,7 @@
   return threadId;
 }
 
-extern "C" void jnjvmThrowExceptionFromJIT();
+extern "C" void j3ThrowExceptionFromJIT();
 
 llvm::Function* JavaJIT::nativeCompile(intptr_t natPtr) {
   
@@ -243,7 +243,7 @@
   const FunctionType *funcType = llvmFunction->getFunctionType();
   const llvm::Type* returnType = funcType->getReturnType();
   
-  bool jnjvm = false;
+  bool j3 = false;
   
   const UTF8* jniConsClName = compilingClass->name;
   const UTF8* jniConsName = compilingMethod->name;
@@ -256,7 +256,7 @@
                             ((mnlen + clen + mtlen) << 3));
   
   if (!natPtr)
-    natPtr = compilingClass->classLoader->nativeLookup(compilingMethod, jnjvm,
+    natPtr = compilingClass->classLoader->nativeLookup(compilingMethod, j3,
                                                        functionName);
   
   if (!natPtr && !TheCompiler->isStaticCompiling()) {
@@ -276,7 +276,7 @@
   
   
   Function* func = llvmFunction;
-  if (jnjvm) {
+  if (j3) {
     compilingMethod->setCompiledPtr((void*)natPtr, functionName);
     llvmFunction->clearGC();
     return llvmFunction;

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------- JavaJIT.h - Java just in time compiler -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
 #include "JavaUpcalls.h"
 #include "j3/JnjvmModule.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class Class;
 class JavaMethod;
@@ -694,6 +694,6 @@
       IMPDEP2 = 0xFF
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------- JavaJITCompiler.cpp - Support for JIT compiling -------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -31,7 +31,7 @@
 #include "j3/JnjvmModule.h"
 #include "j3/JnjvmModuleProvider.h"
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 class JavaJITListener : public llvm::JITEventListener {

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---- JavaJITOpcodes.cpp - Reads and compiles opcodes -----------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -39,7 +39,7 @@
 #include "j3/OpcodeNames.def"
 #endif
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 uint8 arrayType(JavaMethod* meth, unsigned int t) {

Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------- JnjvmModule.cpp - Definition of a Jnjvm module -------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
 #include "j3/JnjvmModule.h"
 #include "j3/JnjvmModuleProvider.h"
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 const llvm::Type* JnjvmModule::JavaObjectType = 0;
@@ -90,7 +90,7 @@
 }
 
 
-namespace jnjvm { 
+namespace j3 { 
   namespace llvm_runtime { 
     #include "LLVMRuntime.inc"
   }
@@ -100,7 +100,7 @@
   Module* module = globalModule;
   
   if (!module->getTypeByName("JavaThread"))
-    jnjvm::llvm_runtime::makeLLVMModuleContents(module);
+    j3::llvm_runtime::makeLLVMModuleContents(module);
 
   VTType = PointerType::getUnqual(module->getTypeByName("VT"));
 
@@ -247,20 +247,20 @@
   module->addTypeName("ArrayDouble", JavaArrayDoubleType->getContainedType(0));
   module->addTypeName("ArrayObject", JavaArrayObjectType->getContainedType(0));
    
-  InterfaceLookupFunction = module->getFunction("jnjvmInterfaceLookup");
-  MultiCallNewFunction = module->getFunction("jnjvmMultiCallNew");
+  InterfaceLookupFunction = module->getFunction("j3InterfaceLookup");
+  MultiCallNewFunction = module->getFunction("j3MultiCallNew");
   ForceLoadedCheckFunction = module->getFunction("forceLoadedCheck");
   InitialisationCheckFunction = module->getFunction("initialisationCheck");
   ForceInitialisationCheckFunction = 
     module->getFunction("forceInitialisationCheck");
-  InitialiseClassFunction = module->getFunction("jnjvmRuntimeInitialiseClass");
+  InitialiseClassFunction = module->getFunction("j3RuntimeInitialiseClass");
   
   GetConstantPoolAtFunction = module->getFunction("getConstantPoolAt");
   ArrayLengthFunction = module->getFunction("arrayLength");
   GetVTFunction = module->getFunction("getVT");
   GetIMTFunction = module->getFunction("getIMT");
   GetClassFunction = module->getFunction("getClass");
-  ClassLookupFunction = module->getFunction("jnjvmClassLookup");
+  ClassLookupFunction = module->getFunction("j3ClassLookup");
   GetVTFromClassFunction = module->getFunction("getVTFromClass");
   GetVTFromClassArrayFunction = module->getFunction("getVTFromClassArray");
   GetVTFromCommonClassFunction = module->getFunction("getVTFromCommonClass");
@@ -269,42 +269,42 @@
     module->getFunction("getObjectSizeFromClass");
  
   GetClassDelegateeFunction = module->getFunction("getClassDelegatee");
-  RuntimeDelegateeFunction = module->getFunction("jnjvmRuntimeDelegatee");
+  RuntimeDelegateeFunction = module->getFunction("j3RuntimeDelegatee");
   IsAssignableFromFunction = module->getFunction("isAssignableFrom");
   IsSecondaryClassFunction = module->getFunction("isSecondaryClass");
   GetDepthFunction = module->getFunction("getDepth");
   GetStaticInstanceFunction = module->getFunction("getStaticInstance");
   GetDisplayFunction = module->getFunction("getDisplay");
   GetVTInDisplayFunction = module->getFunction("getVTInDisplay");
-  AquireObjectFunction = module->getFunction("jnjvmJavaObjectAquire");
-  ReleaseObjectFunction = module->getFunction("jnjvmJavaObjectRelease");
-  OverflowThinLockFunction = module->getFunction("jnjvmOverflowThinLock");
-
-  VirtualFieldLookupFunction = module->getFunction("jnjvmVirtualFieldLookup");
-  StaticFieldLookupFunction = module->getFunction("jnjvmStaticFieldLookup");
-  StringLookupFunction = module->getFunction("jnjvmStringLookup");
-  StartJNIFunction = module->getFunction("jnjvmStartJNI");
-  EndJNIFunction = module->getFunction("jnjvmEndJNI");
+  AquireObjectFunction = module->getFunction("j3JavaObjectAquire");
+  ReleaseObjectFunction = module->getFunction("j3JavaObjectRelease");
+  OverflowThinLockFunction = module->getFunction("j3OverflowThinLock");
+
+  VirtualFieldLookupFunction = module->getFunction("j3VirtualFieldLookup");
+  StaticFieldLookupFunction = module->getFunction("j3StaticFieldLookup");
+  StringLookupFunction = module->getFunction("j3StringLookup");
+  StartJNIFunction = module->getFunction("j3StartJNI");
+  EndJNIFunction = module->getFunction("j3EndJNI");
   
   NullPointerExceptionFunction =
-    module->getFunction("jnjvmNullPointerException");
-  ClassCastExceptionFunction = module->getFunction("jnjvmClassCastException");
+    module->getFunction("j3NullPointerException");
+  ClassCastExceptionFunction = module->getFunction("j3ClassCastException");
   IndexOutOfBoundsExceptionFunction = 
-    module->getFunction("jnjvmIndexOutOfBoundsException");
+    module->getFunction("j3IndexOutOfBoundsException");
   NegativeArraySizeExceptionFunction = 
-    module->getFunction("jnjvmNegativeArraySizeException");
-  OutOfMemoryErrorFunction = module->getFunction("jnjvmOutOfMemoryError");
-  StackOverflowErrorFunction = module->getFunction("jnjvmStackOverflowError");
-  ArrayStoreExceptionFunction = module->getFunction("jnjvmArrayStoreException");
-  ArithmeticExceptionFunction = module->getFunction("jnjvmArithmeticException");
-
-  PrintExecutionFunction = module->getFunction("jnjvmPrintExecution");
-  PrintMethodStartFunction = module->getFunction("jnjvmPrintMethodStart");
-  PrintMethodEndFunction = module->getFunction("jnjvmPrintMethodEnd");
+    module->getFunction("j3NegativeArraySizeException");
+  OutOfMemoryErrorFunction = module->getFunction("j3OutOfMemoryError");
+  StackOverflowErrorFunction = module->getFunction("j3StackOverflowError");
+  ArrayStoreExceptionFunction = module->getFunction("j3ArrayStoreException");
+  ArithmeticExceptionFunction = module->getFunction("j3ArithmeticException");
+
+  PrintExecutionFunction = module->getFunction("j3PrintExecution");
+  PrintMethodStartFunction = module->getFunction("j3PrintMethodStart");
+  PrintMethodEndFunction = module->getFunction("j3PrintMethodEnd");
 
-  ThrowExceptionFunction = module->getFunction("jnjvmThrowException");
+  ThrowExceptionFunction = module->getFunction("j3ThrowException");
 
-  GetArrayClassFunction = module->getFunction("jnjvmGetArrayClass");
+  GetArrayClassFunction = module->getFunction("j3GetArrayClass");
  
   GetFinalInt8FieldFunction = module->getFunction("getFinalInt8Field");
   GetFinalInt16FieldFunction = module->getFunction("getFinalInt16Field");
@@ -319,13 +319,13 @@
   GetJnjvmExceptionClassFunction = 
     module->getFunction("getJnjvmExceptionClass");
   GetJnjvmArrayClassFunction = module->getFunction("getJnjvmArrayClass");
-  StaticCtpLookupFunction = module->getFunction("jnjvmStaticCtpLookup");
-  SpecialCtpLookupFunction = module->getFunction("jnjvmSpecialCtpLookup");
+  StaticCtpLookupFunction = module->getFunction("j3StaticCtpLookup");
+  SpecialCtpLookupFunction = module->getFunction("j3SpecialCtpLookup");
 #endif
  
 #ifdef SERVICE
-  ServiceCallStartFunction = module->getFunction("jnjvmServiceCallStart");
-  ServiceCallStopFunction = module->getFunction("jnjvmServiceCallStop");
+  ServiceCallStartFunction = module->getFunction("j3ServiceCallStart");
+  ServiceCallStopFunction = module->getFunction("j3ServiceCallStop");
 #endif
 
   JavaObjectTracerFunction = module->getFunction("JavaObjectTracer");
@@ -335,12 +335,12 @@
   RegularObjectTracerFunction = module->getFunction("RegularObjectTracer");
 
 #ifndef WITHOUT_VTABLE
-  VirtualLookupFunction = module->getFunction("jnjvmVirtualTableLookup");
+  VirtualLookupFunction = module->getFunction("j3VirtualTableLookup");
 #endif
 
   GetLockFunction = module->getFunction("getLock");
   ThrowExceptionFromJITFunction =
-    module->getFunction("jnjvmThrowExceptionFromJIT");
+    module->getFunction("j3ThrowExceptionFromJIT");
  
 }
 
@@ -385,7 +385,7 @@
   llvm::LoopPass* createLoopSafePointsPass();
 }
 
-namespace jnjvm {
+namespace j3 {
   llvm::FunctionPass* createLowerConstantCallsPass(JnjvmModule* M);
 }
 

Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--- JnjvmModuleProvider.cpp - LLVM Module Provider for Jnjvm ---------===//
 //
-//                              Jnjvm
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -24,7 +24,7 @@
 #include "j3/JnjvmModuleProvider.h"
 
 using namespace llvm;
-using namespace jnjvm;
+using namespace j3;
 
 
 static JavaMethod* staticLookup(CallbackInfo& F) {

Modified: vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----- LowerConstantCalls.cpp - Changes arrayLength calls  --------------===//
 //
-//                               JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 
 using namespace llvm;
 
-namespace jnjvm {
+namespace j3 {
 
   class VISIBILITY_HIDDEN LowerConstantCalls : public FunctionPass {
   public:

Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll Wed Dec 16 15:30:44 2009
@@ -48,8 +48,8 @@
 ;;;;; Constant calls for Jnjvm runtime internal objects field accesses ;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; jnjvmRuntimeInitialiseClass - Initialises the class.
-declare %JavaClass* @jnjvmRuntimeInitialiseClass(%JavaClass*)
+;;; j3RuntimeInitialiseClass - Initialises the class.
+declare %JavaClass* @j3RuntimeInitialiseClass(%JavaClass*)
 
 ;;; arrayLength - Get the length of an array.
 declare i32 @arrayLength(%JavaObject*) readnone 
@@ -102,12 +102,12 @@
 ;;;;;;;;;;;;;;;;;;;;;;;; Generic Runtime methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; jnjvmInterfaceLookup - Used for interface calls.
-declare i8* @jnjvmInterfaceLookup(%JavaClass*, i32, ...)
+;;; j3InterfaceLookup - Used for interface calls.
+declare i8* @j3InterfaceLookup(%JavaClass*, i32, ...)
 
-;;; jnjvmMultiCallNew - Allocate multi-dimensional arrays. This will go to
+;;; j3MultiCallNew - Allocate multi-dimensional arrays. This will go to
 ;;; allocation specific methods.
-declare %JavaObject* @jnjvmMultiCallNew(%JavaCommonClass*, i32, ...)
+declare %JavaObject* @j3MultiCallNew(%JavaCommonClass*, i32, ...)
 
 ;;; initialisationCheck - Checks if the class has been initialized and 
 ;;; initializes if not. This is used for initialization barriers in an isolate
@@ -133,37 +133,37 @@
 declare i8* @getConstantPoolAt(i8* (%JavaClass*, i32, ...)*, i8**,
                                %JavaClass*, i32, ...) readnone
 
-;;; jnjvmVirtualTableLookup - Look up the offset in a virtual table of a
+;;; j3VirtualTableLookup - Look up the offset in a virtual table of a
 ;;; specific function. This function takes a class and an index to lookup in the
 ;;; constant pool and returns and stores it in the constant pool cache.
-declare i8* @jnjvmVirtualTableLookup(%JavaClass*, i32, ...)
+declare i8* @j3VirtualTableLookup(%JavaClass*, i32, ...)
 
-;;; jnjvmClassLookup - Look up a specific class. The function takes a class and
+;;; j3ClassLookup - Look up a specific class. The function takes a class and
 ;;; an index to lookup in the constant pool and returns and stores it in the
 ;;; constant pool cache.
-declare i8* @jnjvmClassLookup(%JavaClass*, i32, ...)
+declare i8* @j3ClassLookup(%JavaClass*, i32, ...)
 
-;;; jnjvmVirtualFieldLookup - Look up a specific virtual field.
-declare i8* @jnjvmVirtualFieldLookup(%JavaClass*, i32, ...)
+;;; j3VirtualFieldLookup - Look up a specific virtual field.
+declare i8* @j3VirtualFieldLookup(%JavaClass*, i32, ...)
 
-;;; jnjvmStaticFieldLookup - Look up a specific static field.
-declare i8* @jnjvmStaticFieldLookup(%JavaClass*, i32, ...)
+;;; j3StaticFieldLookup - Look up a specific static field.
+declare i8* @j3StaticFieldLookup(%JavaClass*, i32, ...)
 
-;;; jnjvmStringLookup - Find the isolate-specific string at the given offset in
+;;; j3StringLookup - Find the isolate-specific string at the given offset in
 ;;; the constant pool.
-declare i8* @jnjvmStringLookup(%JavaClass*, i32, ...) readnone
+declare i8* @j3StringLookup(%JavaClass*, i32, ...) readnone
 
-;;; jnjvmJavaObjectAquire - This function is called when starting a synchronized
+;;; j3JavaObjectAquire - This function is called when starting a synchronized
 ;;; block or method.
-declare void @jnjvmJavaObjectAquire(%JavaObject*)
+declare void @j3JavaObjectAquire(%JavaObject*)
 
-;;; jnjvmJavaObjectRelease - This function is called when leaving a synchronized
+;;; j3JavaObjectRelease - This function is called when leaving a synchronized
 ;;; block or method.
-declare void @jnjvmJavaObjectRelease(%JavaObject*)
+declare void @j3JavaObjectRelease(%JavaObject*)
 
-;;; jnjvmOverflowThinLock - Change a thin lock to a fat lock when the thin lock
+;;; j3OverflowThinLock - Change a thin lock to a fat lock when the thin lock
 ;;; overflows
-declare void @jnjvmOverflowThinLock(%JavaObject*)
+declare void @j3OverflowThinLock(%JavaObject*)
 
 ;;; isAssignableFrom - Returns if a type is a subtype of another type.
 declare i1 @isAssignableFrom(%VT*, %VT*) readnone
@@ -177,13 +177,13 @@
 ;;; the common class.
 declare %JavaObject* @getClassDelegatee(%JavaCommonClass*) readnone 
 
-;;; jnjvmRuntimeDelegatee - Returns the java/lang/Class representation of the
+;;; j3RuntimeDelegatee - Returns the java/lang/Class representation of the
 ;;; class. This method is called if the class delegatee has not been created
 ;;; yet.
-declare %JavaObject* @jnjvmRuntimeDelegatee(%JavaCommonClass*) readnone 
+declare %JavaObject* @j3RuntimeDelegatee(%JavaCommonClass*) readnone 
 
-;;; jnjvmGetArrayClass - Get the array user class of the user class.
-declare %JavaClassArray* @jnjvmGetArrayClass(%JavaCommonClass*, 
+;;; j3GetArrayClass - Get the array user class of the user class.
+declare %JavaClassArray* @j3GetArrayClass(%JavaCommonClass*, 
                                              %JavaClassArray**) readnone
 
 declare i8 @getFinalInt8Field(i8*) readnone
@@ -198,25 +198,25 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Exception methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-declare %JavaObject* @jnjvmNullPointerException()
-declare %JavaObject* @jnjvmClassCastException(%JavaObject*, %JavaCommonClass*)
-declare %JavaObject* @jnjvmIndexOutOfBoundsException(%JavaObject*, i32)
-declare %JavaObject* @jnjvmNegativeArraySizeException(i32)
-declare %JavaObject* @jnjvmOutOfMemoryError(i32)
-declare %JavaObject* @jnjvmStackOverflowError()
-declare %JavaObject* @jnjvmArrayStoreException(%VT*)
-declare %JavaObject* @jnjvmArithmeticException()
-declare void @jnjvmThrowException(%JavaObject*)
-declare void @jnjvmThrowExceptionFromJIT()
+declare %JavaObject* @j3NullPointerException()
+declare %JavaObject* @j3ClassCastException(%JavaObject*, %JavaCommonClass*)
+declare %JavaObject* @j3IndexOutOfBoundsException(%JavaObject*, i32)
+declare %JavaObject* @j3NegativeArraySizeException(i32)
+declare %JavaObject* @j3OutOfMemoryError(i32)
+declare %JavaObject* @j3StackOverflowError()
+declare %JavaObject* @j3ArrayStoreException(%VT*)
+declare %JavaObject* @j3ArithmeticException()
+declare void @j3ThrowException(%JavaObject*)
+declare void @j3ThrowExceptionFromJIT()
 
-declare void @jnjvmEndJNI(i32**, i8**)
-declare void @jnjvmStartJNI(i32*, i32**, i8*, i8**, i8*)
+declare void @j3EndJNI(i32**, i8**)
+declare void @j3StartJNI(i32*, i32**, i8*, i8**, i8*)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Debugging methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-declare void @jnjvmPrintExecution(i32, i32, %JavaMethod*)
-declare void @jnjvmPrintMethodStart(%JavaMethod*)
-declare void @jnjvmPrintMethodEnd(%JavaMethod*)
+declare void @j3PrintExecution(i32, i32, %JavaMethod*)
+declare void @j3PrintMethodStart(%JavaMethod*)
+declare void @j3PrintMethodEnd(%JavaMethod*)

Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll Wed Dec 16 15:30:44 2009
@@ -19,16 +19,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;; Isolate specific methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; jnjvmEnveloppeLookup - Find the enveloppe for the current user class.
-declare i8* @jnjvmEnveloppeLookup(%JavaClass*, i32, ...) readnone
+;;; j3EnveloppeLookup - Find the enveloppe for the current user class.
+declare i8* @j3EnveloppeLookup(%JavaClass*, i32, ...) readnone
 
-;;; jnjvmStaticCtpLookup - Find the user constant pool at the given offset in
+;;; j3StaticCtpLookup - Find the user constant pool at the given offset in
 ;;; the constant pool.
-declare i8* @jnjvmStaticCtpLookup(%JavaClass*, i32, ...) readnone
+declare i8* @j3StaticCtpLookup(%JavaClass*, i32, ...) readnone
 
-;;; jnjvmSpecialCtpLookup - Find the user constant pool at the given offset in
+;;; j3SpecialCtpLookup - Find the user constant pool at the given offset in
 ;;; the constant pool.
-declare i8** @jnjvmSpecialCtpLookup(i8**, i32, i8**) readnone
+declare i8** @j3SpecialCtpLookup(i8**, i32, i8**) readnone
 
 ;;; getCtpCacheNode - Get the constant pool cache of a cache node. This is a
 ;;; constant call because the cache node never changes.

Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll Wed Dec 16 15:30:44 2009
@@ -2,8 +2,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;; Service specific methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; jnjvmServiceCallStart - Mark the switching between services.
-declare void @jnjvmServiceCallStart(i8*, i8*)
+;;; j3ServiceCallStart - Mark the switching between services.
+declare void @j3ServiceCallStart(i8*, i8*)
 
-;;; jnjvmServiceCallStop - Mark the switching between services.
-declare void @jnjvmServiceCallStop(i8*, i8*)
+;;; j3ServiceCallStop - Mark the switching between services.
+declare void @j3ServiceCallStop(i8*, i8*)

Modified: vmkit/trunk/lib/J3/VMCore/JNIReferences.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JNIReferences.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JNIReferences.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JNIReferences.h Wed Dec 16 15:30:44 2009
@@ -12,7 +12,7 @@
 
 #include "mvm/Allocator.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class JavaObject;
 class JavaThread;

Modified: vmkit/trunk/lib/J3/VMCore/JavaAccess.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaAccess.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaAccess.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaAccess.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------- JavaAccess.h - Java access description -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 #ifndef JNJVM_JAVA_ACCESS_H
 #define JNJVM_JAVA_ACCESS_H
 
-namespace jnjvm {
+namespace j3 {
 
 #define ACC_PUBLIC       0x0001
 #define ACC_PRIVATE      0x0002
@@ -66,6 +66,6 @@
 
 #undef MK_VERIFIER
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JavaArray.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaArray.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaArray.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaArray.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------------- JavaArray.cpp - Java arrays ------------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -20,7 +20,7 @@
 #include "LockedMap.h"
 
 
-using namespace jnjvm;
+using namespace j3;
 
 /// This value is the same value than IBM's JVM.
 const sint32 JavaArray::MaxArraySize = 268435455;

Modified: vmkit/trunk/lib/J3/VMCore/JavaArray.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaArray.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaArray.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------------- JavaArray.h - Java arrays --------------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -22,7 +22,7 @@
 
 #include "UTF8.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class ClassArray;
 class CommonClass;
@@ -86,6 +86,6 @@
 
 #undef ARRAYCLASS
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------- JavaClass.cpp - Java class representation -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
 
 #include <cstring>
 
-using namespace jnjvm;
+using namespace j3;
 
 const UTF8* Attribut::annotationsAttribut = 0;
 const UTF8* Attribut::codeAttribut = 0;

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------- JavaClass.h - Java class representation -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
 #include <cassert>
 #include <set>
 
-namespace jnjvm {
+namespace j3 {
 
 class ArrayObject;
 class ArrayUInt8;
@@ -220,25 +220,25 @@
   /// isArray - Is the class an array class?
   ///
   bool isArray() const {
-    return jnjvm::isArray(access);
+    return j3::isArray(access);
   }
   
   /// isPrimitive - Is the class a primitive class?
   ///
   bool isPrimitive() const {
-    return jnjvm::isPrimitive(access);
+    return j3::isPrimitive(access);
   }
   
   /// isInterface - Is the class an interface?
   ///
   bool isInterface() const {
-    return jnjvm::isInterface(access);
+    return j3::isInterface(access);
   }
   
   /// isClass - Is the class a real, instantiable class?
   ///
   bool isClass() const {
-    return jnjvm::isClass(access);
+    return j3::isClass(access);
   }
 
   /// asClass - Returns the class as a user-defined class
@@ -1385,7 +1385,7 @@
 };
 
 
-} // end namespace jnjvm
+} // end namespace j3
 
 
 #ifdef ISOLATE_SHARING

Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--- JavaConstantPool.cpp - Java constant pool definition ---------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -26,7 +26,7 @@
 #include "LockedMap.h"
 #include "Reader.h"
  
-using namespace jnjvm;
+using namespace j3;
 
 const uint32 JavaConstantPool::ConstantUTF8 = 1;
 const uint32 JavaConstantPool::ConstantInteger = 3;

Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--- JavaConstantPool.h - Java constant pool definition ---------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 
 #include "UTF8.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class Class;
 class CommonClass;
@@ -259,6 +259,6 @@
   ~JavaConstantPool() {}
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-------- JavaInitialise.cpp - Initialization of JnJVM ----------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 #include "IsolateSharedLoader.h"
 #endif
 
-using namespace jnjvm;
+using namespace j3;
 
 
 #ifdef ISOLATE_SHARING

Modified: vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp Wed Dec 16 15:30:44 2009
@@ -11,7 +11,7 @@
 #include "JavaThread.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 JavaLock* JavaLock::allocate(JavaObject* obj) {
   Jnjvm* vm = JavaThread::get()->getJVM();

Modified: vmkit/trunk/lib/J3/VMCore/JavaLocks.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaLocks.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaLocks.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaLocks.h Wed Dec 16 15:30:44 2009
@@ -17,7 +17,7 @@
   class Thread;
 }
 
-namespace jnjvm {
+namespace j3 {
 
 class JavaObject;
 class JavaThread;

Modified: vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---- JavaMetaJIT.cpp - Functions for Java internal objects -----------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 #define readArgs(buf, signature, ap, jni) \
   Typedef* const* arguments = signature->getArgumentsType(); \

Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------- JavaObject.cpp - Java object definition ------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 void JavaObject::waitIntern(struct timeval* info, bool timed) {
   JavaLock* l = 0;

Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------- JavaObject.h - Java object definition -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
 #include "JavaLocks.h"
 #include "JnjvmConfig.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class JavaObject;
 class JavaThread;
@@ -285,6 +285,6 @@
 };
 
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
 //===-------------------- JavaRuntimeJIT.cpp ------------------------------===//
 //=== ---- Runtime functions called by code compiled by the JIT -----------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -22,9 +22,9 @@
 
 #include <cstdarg>
 
-using namespace jnjvm;
+using namespace j3;
 
-extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3InterfaceLookup(UserClass* caller, uint32 index) {
 
   void* res = 0;
 
@@ -58,7 +58,7 @@
 }
 
 // Throws if the field is not found.
-extern "C" void* jnjvmVirtualFieldLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3VirtualFieldLookup(UserClass* caller, uint32 index) {
   
   void* res = 0;
   
@@ -94,7 +94,7 @@
 }
 
 // Throws if the field or its class is not found.
-extern "C" void* jnjvmStaticFieldLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3StaticFieldLookup(UserClass* caller, uint32 index) {
   
   void* res = 0;
   
@@ -140,7 +140,7 @@
 
 #ifndef WITHOUT_VTABLE
 // Throws if the method is not found.
-extern "C" void* jnjvmVirtualTableLookup(UserClass* caller, uint32 index, ...) {
+extern "C" void* j3VirtualTableLookup(UserClass* caller, uint32 index, ...) {
   
   void* res = 0;
   
@@ -190,7 +190,7 @@
 #endif
 
 // Throws if the class is not found.
-extern "C" void* jnjvmClassLookup(UserClass* caller, uint32 index) { 
+extern "C" void* j3ClassLookup(UserClass* caller, uint32 index) { 
   
   void* res = 0;
   
@@ -217,7 +217,7 @@
 
 // Calls Java code.
 // Throws if initializing the class throws an exception.
-extern "C" UserCommonClass* jnjvmRuntimeInitialiseClass(UserClass* cl) {
+extern "C" UserCommonClass* j3RuntimeInitialiseClass(UserClass* cl) {
   BEGIN_NATIVE_EXCEPTION(1)
  
   cl->resolveClass();
@@ -234,7 +234,7 @@
 }
 
 // Calls Java code.
-extern "C" JavaObject* jnjvmRuntimeDelegatee(UserCommonClass* cl) {
+extern "C" JavaObject* j3RuntimeDelegatee(UserCommonClass* cl) {
   JavaObject* res = 0;
   llvm_gcroot(res, 0);
 
@@ -282,7 +282,7 @@
 }
 
 // Throws if one of the dimension is negative.
-extern "C" JavaArray* jnjvmMultiCallNew(UserClassArray* cl, uint32 len, ...) {
+extern "C" JavaArray* j3MultiCallNew(UserClassArray* cl, uint32 len, ...) {
   JavaArray* res = 0;
   llvm_gcroot(res, 0);
 
@@ -303,7 +303,7 @@
 }
 
 // Throws if the class can not be resolved.
-extern "C" UserClassArray* jnjvmGetArrayClass(UserCommonClass* cl,
+extern "C" UserClassArray* j3GetArrayClass(UserCommonClass* cl,
                                               UserClassArray** dcl) {
   UserClassArray* res = 0;
 
@@ -327,7 +327,7 @@
 }
 
 // Does not call Java code. Can not yield a GC.
-extern "C" void jnjvmEndJNI(uint32** oldLRN, void** oldBuffer) {
+extern "C" void j3EndJNI(uint32** oldLRN, void** oldBuffer) {
   JavaThread* th = JavaThread::get();
   
   // We're going back to Java
@@ -342,14 +342,14 @@
 
 }
 
-extern "C" void* jnjvmStartJNI(uint32* localReferencesNumber,
+extern "C" void* j3StartJNI(uint32* localReferencesNumber,
                                uint32** oldLocalReferencesNumber,
                                void* newBuffer, void** oldBuffer,
                                mvm::KnownFrame* Frame) 
   __attribute__((noinline));
 
 // Never throws. Does not call Java code. Can not yied a GC.
-extern "C" void* jnjvmStartJNI(uint32* localReferencesNumber,
+extern "C" void* j3StartJNI(uint32* localReferencesNumber,
                                uint32** oldLocalReferencesNumber,
                                void* newBuffer, void** oldBuffer,
                                mvm::KnownFrame* Frame) {
@@ -369,7 +369,7 @@
 }
 
 // Never throws.
-extern "C" void jnjvmJavaObjectAquire(JavaObject* obj) {
+extern "C" void j3JavaObjectAquire(JavaObject* obj) {
   BEGIN_NATIVE_EXCEPTION(1)
   
   llvm_gcroot(obj, 0);
@@ -379,7 +379,7 @@
 }
 
 // Never throws.
-extern "C" void jnjvmJavaObjectRelease(JavaObject* obj) {
+extern "C" void j3JavaObjectRelease(JavaObject* obj) {
   BEGIN_NATIVE_EXCEPTION(1)
   
   llvm_gcroot(obj, 0);
@@ -389,17 +389,17 @@
 }
 
 // Does not call any Java code. Can not yield a GC.
-extern "C" void jnjvmThrowException(JavaObject* obj) {
+extern "C" void j3ThrowException(JavaObject* obj) {
   return JavaThread::get()->throwException(obj);
 }
 
 // Never throws.
-extern "C" void jnjvmOverflowThinLock(JavaObject* obj) {
+extern "C" void j3OverflowThinLock(JavaObject* obj) {
   obj->overflowThinLock();
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmNullPointerException() {
+extern "C" JavaObject* j3NullPointerException() {
   
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
@@ -420,7 +420,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmNegativeArraySizeException(sint32 val) {
+extern "C" JavaObject* j3NegativeArraySizeException(sint32 val) {
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
 
@@ -440,7 +440,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmOutOfMemoryError(sint32 val) {
+extern "C" JavaObject* j3OutOfMemoryError(sint32 val) {
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
 
@@ -460,7 +460,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmStackOverflowError() {
+extern "C" JavaObject* j3StackOverflowError() {
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
 
@@ -480,7 +480,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmArithmeticException() {
+extern "C" JavaObject* j3ArithmeticException() {
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
 
@@ -500,7 +500,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmClassCastException(JavaObject* obj,
+extern "C" JavaObject* j3ClassCastException(JavaObject* obj,
                                                UserCommonClass* cl) {
   JavaObject *exc = 0;
   llvm_gcroot(obj, 0);
@@ -524,7 +524,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmIndexOutOfBoundsException(JavaObject* obj,
+extern "C" JavaObject* j3IndexOutOfBoundsException(JavaObject* obj,
                                                       sint32 index) {
   JavaObject *exc = 0;
   llvm_gcroot(obj, 0);
@@ -548,7 +548,7 @@
 }
 
 // Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmArrayStoreException(JavaVirtualTable* VT) {
+extern "C" JavaObject* j3ArrayStoreException(JavaVirtualTable* VT) {
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
 
@@ -568,7 +568,7 @@
 }
 
 // Create an exception then throws it.
-extern "C" void jnjvmThrowExceptionFromJIT() {
+extern "C" void j3ThrowExceptionFromJIT() {
   JavaObject *exc = 0;
   JavaThread *th = JavaThread::get();
   
@@ -587,7 +587,7 @@
   
 }
 
-extern "C" void* jnjvmStringLookup(UserClass* cl, uint32 index) {
+extern "C" void* j3StringLookup(UserClass* cl, uint32 index) {
   
   JavaString** str = 0;
   
@@ -605,19 +605,19 @@
   return (void*)str;
 }
 
-extern "C" void jnjvmPrintMethodStart(JavaMethod* meth) {
+extern "C" void j3PrintMethodStart(JavaMethod* meth) {
   fprintf(stderr, "[%p] executing %s.%s\n", (void*)mvm::Thread::get(),
           UTF8Buffer(meth->classDef->name).cString(),
           UTF8Buffer(meth->name).cString());
 }
 
-extern "C" void jnjvmPrintMethodEnd(JavaMethod* meth) {
+extern "C" void j3PrintMethodEnd(JavaMethod* meth) {
   fprintf(stderr, "[%p] return from %s.%s\n", (void*)mvm::Thread::get(),
           UTF8Buffer(meth->classDef->name).cString(),
           UTF8Buffer(meth->name).cString());
 }
 
-extern "C" void jnjvmPrintExecution(uint32 opcode, uint32 index,
+extern "C" void j3PrintExecution(uint32 opcode, uint32 index,
                                     JavaMethod* meth) {
   fprintf(stderr, "[%p] executing %s.%s %s at %d\n", (void*)mvm::Thread::get(),
          UTF8Buffer(meth->classDef->name).cString(),
@@ -627,7 +627,7 @@
 
 #ifdef SERVICE
 
-extern "C" void jnjvmServiceCallStart(Jnjvm* OldService,
+extern "C" void j3ServiceCallStart(Jnjvm* OldService,
                                  Jnjvm* NewService) {
   fprintf(stderr, "I have switched from %d to %d\n", OldService->IsolateID,
           NewService->IsolateID);
@@ -635,7 +635,7 @@
   fprintf(stderr, "Now the thread id is %d\n", mvm::Thread::get()->IsolateID);
 }
 
-extern "C" void jnjvmServiceCallStop(Jnjvm* OldService,
+extern "C" void j3ServiceCallStop(Jnjvm* OldService,
                                 Jnjvm* NewService) {
   fprintf(stderr, "End service call\n");
 }
@@ -644,7 +644,7 @@
 
 
 #ifdef ISOLATE_SHARING
-extern "C" void* jnjvmStaticCtpLookup(UserClass* cl, uint32 index) {
+extern "C" void* j3StaticCtpLookup(UserClass* cl, uint32 index) {
   UserConstantPool* ctpInfo = cl->getConstantPool();
   JavaConstantPool* shared = ctpInfo->getSharedPool();
   uint32 clIndex = shared->getClassIndexFromMethod(index);
@@ -663,7 +663,7 @@
   return (void*)methodCl->getConstantPool();
 }
 
-extern "C" UserConstantPool* jnjvmSpecialCtpLookup(UserConstantPool* ctpInfo,
+extern "C" UserConstantPool* j3SpecialCtpLookup(UserConstantPool* ctpInfo,
                                                    uint32 index,
                                                    UserConstantPool** res) {
   JavaConstantPool* shared = ctpInfo->getSharedPool();

Modified: vmkit/trunk/lib/J3/VMCore/JavaString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-- JavaString.cpp - Internal correspondance with Java Strings --------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 #include "Jnjvm.h"
 #include "LockedMap.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 JavaVirtualTable* JavaString::internStringVT = 0;
 

Modified: vmkit/trunk/lib/J3/VMCore/JavaString.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--- JavaString.h - Internal correspondance with Java Strings ---------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 #include "JavaObject.h"
 #include "UTF8.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class ArrayUInt16;
 class Jnjvm;
@@ -48,6 +48,6 @@
   static JavaVirtualTable* internStringVT;
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------- JavaThread.cpp - Java thread description -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
 #include "Jnjvm.h"
 
 
-using namespace jnjvm;
+using namespace j3;
 
 const unsigned int JavaThread::StateRunning = 0;
 const unsigned int JavaThread::StateWaiting = 1;

Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------- JavaThread.h - Java thread description -------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -22,7 +22,7 @@
 #include "JavaObject.h"
 #include "JNIReferences.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class Class;
 class JavaMethod;
@@ -294,6 +294,6 @@
 
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===------------- JavaTypes.cpp - Java primitives ------------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -14,7 +14,7 @@
 #include "JavaCompiler.h"
 #include "JavaTypes.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 UserCommonClass* ArrayTypedef::assocClass(JnjvmClassLoader* loader) const {
   return loader->constructArray(keyName);

Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------------- JavaTypes.h - Java primitives ------------------------===//
 //
-//                              JnJVM
+//                          The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
 
 #include "JnjvmClassLoader.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class UserCommonClass;
 class JnjvmClassLoader;
@@ -413,6 +413,6 @@
 };
 
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jni.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jni.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
-//===------------- Jni.cpp - Jni interface for JnJVM ----------------------===//
+//===---------------- Jni.cpp - Jni interface for J3 ----------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.
@@ -20,7 +20,7 @@
 #include "Jnjvm.h"
 
 
-using namespace jnjvm;
+using namespace j3;
 
 static Jnjvm* myVM(JNIEnv* env) {
   return JavaThread::get()->getJVM();

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---------- Jnjvm.cpp - Java virtual machine description --------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -36,7 +36,7 @@
 #include "Reader.h"
 #include "Zip.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 const char* Jnjvm::dirSeparator = "/";
 const char* Jnjvm::envSeparator = ":";

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---------- Jnjvm.h - Java virtual machine description ---------------===//
 //
-//                              JnJVM
+//                          The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -25,7 +25,7 @@
 #include "JNIReferences.h"
 #include "LockedMap.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class ArrayObject;
 class Classpath;
@@ -375,6 +375,6 @@
 
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-- JnjvmClassLoader.cpp - Jnjvm representation of a class loader ------===//
 //
-//                              Jnjvm
+//                          The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -51,7 +51,7 @@
 #include "Zip.h"
 
 
-using namespace jnjvm;
+using namespace j3;
 
 typedef void (*static_init_t)(JnjvmClassLoader*);
 
@@ -1036,7 +1036,7 @@
   return readerConstructUTF8(buf, n);
 }
 
-intptr_t JnjvmClassLoader::loadInLib(const char* buf, bool& jnjvm) {
+intptr_t JnjvmClassLoader::loadInLib(const char* buf, bool& j3) {
   uintptr_t res = (uintptr_t)TheCompiler->loadMethod(SELF_HANDLE, buf);
   
   if (!res) {
@@ -1046,11 +1046,11 @@
       if (res) break;
     }
   } else {
-    jnjvm = true;
+    j3 = true;
   }
   
   if (!res && this != bootstrapLoader)
-    res = bootstrapLoader->loadInLib(buf, jnjvm);
+    res = bootstrapLoader->loadInLib(buf, j3);
 
   return (intptr_t)res;
 }
@@ -1065,14 +1065,14 @@
   return (intptr_t)TheCompiler->loadMethod(handle, name);
 }
 
-intptr_t JnjvmClassLoader::nativeLookup(JavaMethod* meth, bool& jnjvm,
+intptr_t JnjvmClassLoader::nativeLookup(JavaMethod* meth, bool& j3,
                                         char* buf) {
 
   meth->jniConsFromMeth(buf);
-  intptr_t res = loadInLib(buf, jnjvm);
+  intptr_t res = loadInLib(buf, j3);
   if (!res) {
     meth->jniConsFromMethOverloaded(buf);
-    res = loadInLib(buf, jnjvm);
+    res = loadInLib(buf, j3);
   }
   return res;
 }
@@ -1213,7 +1213,7 @@
 }
 
 extern "C" intptr_t vmjcNativeLoader(JavaMethod* meth) {
-  bool jnjvm = false;
+  bool j3 = false;
   const UTF8* jniConsClName = meth->classDef->name;
   const UTF8* jniConsName = meth->name;
   const UTF8* jniConsType = meth->type;
@@ -1223,7 +1223,7 @@
 
   char* buf = (char*)alloca(3 + JNI_NAME_PRE_LEN + 1 +
                             ((mnlen + clen + mtlen) << 3));
-  intptr_t res = meth->classDef->classLoader->nativeLookup(meth, jnjvm, buf);
+  intptr_t res = meth->classDef->classLoader->nativeLookup(meth, j3, buf);
   assert(res && "Could not find required native method");
   return res;
 }

Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===-- JnjvmClassLoader.h - Jnjvm representation of a class loader -------===//
 //
-//                              Jnjvm
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -24,7 +24,7 @@
 #include "JnjvmConfig.h"
 #include "UTF8.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class ArrayUInt8;
 class UserClass;
@@ -257,9 +257,9 @@
 
   /// loadInLib - Loads a native function out of the native libraries loaded
   /// by this class loader. The last argument tells if the returned method
-  /// is defined in jnjvm.
+  /// is defined in j3.
   ///
-  intptr_t loadInLib(const char* buf, bool& jnjvm);
+  intptr_t loadInLib(const char* buf, bool& j3);
 
   /// loadInLib - Loads a native function out of the given native library.
   ///
@@ -270,10 +270,10 @@
   void* loadLib(const char* buf);
 
   /// nativeLookup - Lookup in the class loader a function pointer for the
-  /// method. Also set in the jnjvm parameter is the function is defined in
+  /// method. Also set in the j3 parameter is the function is defined in
   /// JnJVM.
   ///
-  intptr_t nativeLookup(JavaMethod* meth, bool& jnjvm, char* buf);
+  intptr_t nativeLookup(JavaMethod* meth, bool& j3, char* buf);
 
   /// insertAllMethodsInVM - Insert all methods defined by this class loader
   /// in the VM.
@@ -502,6 +502,6 @@
   }
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif // JNJVM_CLASSLOADER_H

Modified: vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===---------- JnjvmConfig.h - Jnjvm configuration file ------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 #define ISOLATE_STATIC
 #else
 
-namespace jnjvm {
+namespace j3 {
 
 class ClassArray;
 class ClassPrimitive;

Modified: vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
 //===--------------------- LinkJavaRuntime.h ------------------------------===//
 //=== ------------- Reference all runtime functions -----------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -12,7 +12,7 @@
 #define JNJVM_LINK_JAVA_RUNTIME_H
 
 
-namespace jnjvm {
+namespace j3 {
   class JavaObject;
   class UserClass;
   class UserClassArray;
@@ -23,46 +23,46 @@
   class Jnjvm;
 }
 
-using namespace jnjvm;
+using namespace j3;
 
-extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index);
-extern "C" void* jnjvmVirtualFieldLookup(UserClass* caller, uint32 index);
-extern "C" void* jnjvmStaticFieldLookup(UserClass* caller, uint32 index);
-extern "C" void* jnjvmVirtualTableLookup(UserClass* caller, uint32 index, ...);
-extern "C" void* jnjvmStringLookup(UserClass* cl, uint32 index);
-extern "C" void* jnjvmClassLookup(UserClass* caller, uint32 index);
-extern "C" UserCommonClass* jnjvmRuntimeInitialiseClass(UserClass* cl);
-extern "C" JavaObject* jnjvmRuntimeDelegatee(UserCommonClass* cl);
-extern "C" JavaArray* jnjvmMultiCallNew(UserClassArray* cl, uint32 len, ...);
-extern "C" UserClassArray* jnjvmGetArrayClass(UserCommonClass*,
+extern "C" void* j3InterfaceLookup(UserClass* caller, uint32 index);
+extern "C" void* j3VirtualFieldLookup(UserClass* caller, uint32 index);
+extern "C" void* j3StaticFieldLookup(UserClass* caller, uint32 index);
+extern "C" void* j3VirtualTableLookup(UserClass* caller, uint32 index, ...);
+extern "C" void* j3StringLookup(UserClass* cl, uint32 index);
+extern "C" void* j3ClassLookup(UserClass* caller, uint32 index);
+extern "C" UserCommonClass* j3RuntimeInitialiseClass(UserClass* cl);
+extern "C" JavaObject* j3RuntimeDelegatee(UserCommonClass* cl);
+extern "C" JavaArray* j3MultiCallNew(UserClassArray* cl, uint32 len, ...);
+extern "C" UserClassArray* j3GetArrayClass(UserCommonClass*,
                                               UserClassArray**);
-extern "C" void jnjvmEndJNI();
-extern "C" void* jnjvmStartJNI();
-extern "C" void jnjvmJavaObjectAquire(JavaObject* obj);
-extern "C" void jnjvmJavaObjectRelease(JavaObject* obj);
-extern "C" void jnjvmThrowException(JavaObject* obj);
-extern "C" void jnjvmOverflowThinLock(JavaObject* obj);
-extern "C" JavaObject* jnjvmNullPointerException();
-extern "C" JavaObject* jnjvmNegativeArraySizeException(sint32 val);
-extern "C" JavaObject* jnjvmOutOfMemoryError(sint32 val);
-extern "C" JavaObject* jnjvmStackOverflowError();
-extern "C" JavaObject* jnjvmArithmeticException();
-extern "C" JavaObject* jnjvmClassCastException(JavaObject* obj,
+extern "C" void j3EndJNI();
+extern "C" void* j3StartJNI();
+extern "C" void j3JavaObjectAquire(JavaObject* obj);
+extern "C" void j3JavaObjectRelease(JavaObject* obj);
+extern "C" void j3ThrowException(JavaObject* obj);
+extern "C" void j3OverflowThinLock(JavaObject* obj);
+extern "C" JavaObject* j3NullPointerException();
+extern "C" JavaObject* j3NegativeArraySizeException(sint32 val);
+extern "C" JavaObject* j3OutOfMemoryError(sint32 val);
+extern "C" JavaObject* j3StackOverflowError();
+extern "C" JavaObject* j3ArithmeticException();
+extern "C" JavaObject* j3ClassCastException(JavaObject* obj,
                                                UserCommonClass* cl);
-extern "C" JavaObject* jnjvmIndexOutOfBoundsException(JavaObject* obj,
+extern "C" JavaObject* j3IndexOutOfBoundsException(JavaObject* obj,
                                                       sint32 index);
-extern "C" JavaObject* jnjvmArrayStoreException(JavaVirtualTable* VT);
-extern "C" void jnjvmThrowExceptionFromJIT();
-extern "C" void jnjvmPrintMethodStart(JavaMethod* meth);
-extern "C" void jnjvmPrintMethodEnd(JavaMethod* meth);
-extern "C" void jnjvmPrintExecution(uint32 opcode, uint32 index,
+extern "C" JavaObject* j3ArrayStoreException(JavaVirtualTable* VT);
+extern "C" void j3ThrowExceptionFromJIT();
+extern "C" void j3PrintMethodStart(JavaMethod* meth);
+extern "C" void j3PrintMethodEnd(JavaMethod* meth);
+extern "C" void j3PrintExecution(uint32 opcode, uint32 index,
                                     JavaMethod* meth);
 
 
 #ifdef SERVICE
-extern "C" void jnjvmServiceCallStart(Jnjvm* OldService,
+extern "C" void j3ServiceCallStart(Jnjvm* OldService,
                                       Jnjvm* NewService);
-extern "C" void jnjvmServiceCallStop(Jnjvm* OldService,
+extern "C" void j3ServiceCallStop(Jnjvm* OldService,
                                      Jnjvm* NewService);
 #endif
 
@@ -70,8 +70,8 @@
 
 
 #ifdef ISOLATE_SHARING
-extern "C" void* jnjvmStaticCtpLookup(UserClass* cl, uint32 index);
-extern "C" UserConstantPool* jnjvmSpecialCtpLookup(UserConstantPool* ctpInfo,
+extern "C" void* j3StaticCtpLookup(UserClass* cl, uint32 index);
+extern "C" UserConstantPool* j3SpecialCtpLookup(UserConstantPool* ctpInfo,
                                                    uint32 index,
                                                    UserConstantPool** res);
 #endif
@@ -87,42 +87,42 @@
       if (std::getenv("bar") != (char*) -1) 
         return;
       
-      (void) jnjvmInterfaceLookup(0, 0);
-      (void) jnjvmVirtualFieldLookup(0, 0);
-      (void) jnjvmStaticFieldLookup(0, 0);
-      (void) jnjvmVirtualTableLookup(0, 0);
-      (void) jnjvmClassLookup(0, 0);
-      (void) jnjvmRuntimeInitialiseClass(0);
-      (void) jnjvmRuntimeDelegatee(0);
-      (void) jnjvmMultiCallNew(0, 0);
-      (void) jnjvmGetArrayClass(0, 0);
-      (void) jnjvmEndJNI();
-      (void) jnjvmStartJNI();
-      (void) jnjvmJavaObjectAquire(0);
-      (void) jnjvmJavaObjectRelease(0);
-      (void) jnjvmThrowException(0);
-      (void) jnjvmOverflowThinLock(0);
-      (void) jnjvmNullPointerException();
-      (void) jnjvmNegativeArraySizeException(0);
-      (void) jnjvmOutOfMemoryError(0);
-      (void) jnjvmStackOverflowError();
-      (void) jnjvmArithmeticException();
-      (void) jnjvmClassCastException(0, 0);
-      (void) jnjvmIndexOutOfBoundsException(0, 0);
-      (void) jnjvmArrayStoreException(0);
-      (void) jnjvmThrowExceptionFromJIT();
-      (void) jnjvmPrintMethodStart(0);
-      (void) jnjvmPrintMethodEnd(0);
-      (void) jnjvmPrintExecution(0, 0, 0);
-      (void) jnjvmStringLookup(0, 0);
+      (void) j3InterfaceLookup(0, 0);
+      (void) j3VirtualFieldLookup(0, 0);
+      (void) j3StaticFieldLookup(0, 0);
+      (void) j3VirtualTableLookup(0, 0);
+      (void) j3ClassLookup(0, 0);
+      (void) j3RuntimeInitialiseClass(0);
+      (void) j3RuntimeDelegatee(0);
+      (void) j3MultiCallNew(0, 0);
+      (void) j3GetArrayClass(0, 0);
+      (void) j3EndJNI();
+      (void) j3StartJNI();
+      (void) j3JavaObjectAquire(0);
+      (void) j3JavaObjectRelease(0);
+      (void) j3ThrowException(0);
+      (void) j3OverflowThinLock(0);
+      (void) j3NullPointerException();
+      (void) j3NegativeArraySizeException(0);
+      (void) j3OutOfMemoryError(0);
+      (void) j3StackOverflowError();
+      (void) j3ArithmeticException();
+      (void) j3ClassCastException(0, 0);
+      (void) j3IndexOutOfBoundsException(0, 0);
+      (void) j3ArrayStoreException(0);
+      (void) j3ThrowExceptionFromJIT();
+      (void) j3PrintMethodStart(0);
+      (void) j3PrintMethodEnd(0);
+      (void) j3PrintExecution(0, 0, 0);
+      (void) j3StringLookup(0, 0);
 #ifdef SERVICE
-      (void) jnjvmServiceCallStart(0, 0);
-      (void) jnjvmServiceCallStop(0, 0);
+      (void) j3ServiceCallStart(0, 0);
+      (void) j3ServiceCallStop(0, 0);
 #endif
 
 #ifdef ISOLATE_SHARING
-      (void) jnjvmStaticCtpLookup(0, 0);
-      (void) jnjvmSpecialCtpLookup(0, 0, 0);
+      (void) j3StaticCtpLookup(0, 0);
+      (void) j3SpecialCtpLookup(0, 0, 0);
 #endif
 
     }

Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===------- LockedMap.cpp - Implementation of the UTF8 map ---------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -18,7 +18,7 @@
 
 #include <cstring>
 
-using namespace jnjvm;
+using namespace j3;
 
 void StringMap::insert(JavaString* str) {
   llvm_gcroot(str, 0);

Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===------- LockedMap.h - A thread-safe map implementation ---------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -28,7 +28,7 @@
 
 #include "JavaArray.h" // for comparing UTF8s
 
-namespace jnjvm {
+namespace j3 {
 
 class JavaString;
 class Signdef;
@@ -198,6 +198,6 @@
   
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Reader.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Reader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Reader.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------------- Reader.cpp - Open and read files ---------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
 #include "Reader.h"
 #include "Zip.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 const int Reader::SeekSet = SEEK_SET;
 const int Reader::SeekCur = SEEK_CUR;

Modified: vmkit/trunk/lib/J3/VMCore/Reader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Reader.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Reader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Reader.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------------- Reader.h - Open and read files ---------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
 #include "JavaArray.h"
 #include "JavaClass.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class JnjvmBootstrapLoader;
 class ZipArchive;
@@ -138,6 +138,6 @@
 
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/lib/J3/VMCore/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/UTF8.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/UTF8.h (original)
+++ vmkit/trunk/lib/J3/VMCore/UTF8.h Wed Dec 16 15:30:44 2009
@@ -1,3 +1,12 @@
+//===------------------- UTF8.h - Utilities for UTF8 ----------------------===//
+//
+//                            The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
 #ifndef _JNJVM_UTF8_H_
 #define _JNJVM_UTF8_H_
 
@@ -6,7 +15,7 @@
 #include "mvm/UTF8.h"
 #include "mvm/PrintBuffer.h"
 
-namespace jnjvm {
+namespace j3 {
 	using mvm::UTF8;
 	using mvm::UTF8Map;
 

Modified: vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp Wed Dec 16 15:30:44 2009
@@ -1,4 +1,4 @@
-//===--- VirtualTables.cpp - Virtual methods for JnJVM objects ------------===//
+//===------ VirtualTables.cpp - Virtual methods for J3 objects ------------===//
 //
 //                          The VMKit project
 //
@@ -30,7 +30,7 @@
 #include "JnjvmClassLoader.h"
 #include "LockedMap.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 //===----------------------------------------------------------------------===//
 // List of classes that will be GC-allocated. One should try to keep this

Modified: vmkit/trunk/lib/J3/VMCore/Zip.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Zip.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Zip.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Zip.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------------- Zip.cpp - Interface with zlib ----------------------===//
 //
-//                              JnJVM
+//                            The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
 #include "Reader.h"
 #include "Zip.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 ZipArchive::ZipArchive(ArrayUInt8* bytes, mvm::BumpPtrAllocator& A) : allocator(A) {
   this->bytes = bytes;

Modified: vmkit/trunk/lib/J3/VMCore/Zip.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Zip.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Zip.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Zip.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===----------------- Zip.h - Interface with zlib ------------------------===//
 //
-//                              JnJVM
+//                          The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
@@ -14,7 +14,7 @@
 
 #include "mvm/Allocator.h"
 
-namespace jnjvm {
+namespace j3 {
 
 class ArrayUInt8;
 class JnjvmBootstrapLoader;
@@ -76,6 +76,6 @@
 
 };
 
-} // end namespace jnjvm
+} // end namespace j3
 
 #endif

Modified: vmkit/trunk/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/tools/j3/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Wed Dec 16 15:30:44 2009
@@ -19,7 +19,7 @@
 #include "llvm/Support/ManagedStatic.h"
 
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 using namespace mvm;
 

Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Wed Dec 16 15:30:44 2009
@@ -54,7 +54,7 @@
 #include <memory>
 #include <string>
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 static cl::opt<std::string>

Modified: vmkit/trunk/tools/vmkit/CommandLine.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/CommandLine.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/CommandLine.cpp (original)
+++ vmkit/trunk/tools/vmkit/CommandLine.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===------- CommandLine.cpp - Parses the command line --------------------===//
 //
-//                     The Micro Virtual Machine
+//                     The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.

Modified: vmkit/trunk/tools/vmkit/CommandLine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/CommandLine.h?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/CommandLine.h (original)
+++ vmkit/trunk/tools/vmkit/CommandLine.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
 //===--------- CommandLine.h - Parses the command line --------------------===//
 //
-//                     The Micro Virtual Machine
+//                     The VMKit project
 //
 // This file is distributed under the University of Illinois Open Source 
 // License. See LICENSE.TXT for details.

Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=91568&r1=91567&r2=91568&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Dec 16 15:30:44 2009
@@ -30,7 +30,7 @@
 
 #include "CommandLine.h"
 
-using namespace jnjvm;
+using namespace j3;
 using namespace llvm;
 
 enum VMType {




From nicolas.geoffray at lip6.fr  Wed Dec 16 13:42:06 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 16 Dec 2009 21:42:06 -0000
Subject: [vmkit-commits] [vmkit] r91569 - in /vmkit/trunk/mmtk:
 mmtk-alloc/Selected.cpp mmtk-fake/Selected.cpp mmtk-j3/ActivePlan.cpp
 mmtk-j3/Assert.cpp mmtk-j3/Collection.cpp mmtk-j3/FinalizableProcessor.cpp
 mmtk-j3/Lock.cpp mmtk-j3/Memory.cpp mmtk-j3/ObjectModel.cpp
 mmtk-j3/ReferenceProcessor.cpp mmtk-j3/RuntimeHelpers.cpp
 mmtk-j3/Scanning.cpp mmtk-j3/Selected.cpp mmtk-j3/Statistics.cpp
 mmtk-j3/Strings.cpp mmtk-j3/SynchronizedCounter.cpp
 mmtk-j3/TraceInterface.cpp mmtk-j3/VM.cpp
Message-ID: <200912162142.nBGLg7UJ032702@zion.cs.uiuc.edu>

Author: geoffray
Date: Wed Dec 16 15:42:06 2009
New Revision: 91569

URL: http://llvm.org/viewvc/llvm-project?rev=91569&view=rev
Log:
Forgot these changes from last commit.

Modified:
    vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
    vmkit/trunk/mmtk/mmtk-fake/Selected.cpp
    vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp
    vmkit/trunk/mmtk/mmtk-j3/Assert.cpp
    vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
    vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
    vmkit/trunk/mmtk/mmtk-j3/Lock.cpp
    vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
    vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
    vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
    vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp
    vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
    vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
    vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
    vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
    vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp
    vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
    vmkit/trunk/mmtk/mmtk-j3/VM.cpp

Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
 #include "JavaThread.h"
 #include "MutatorThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void* JnJVM_org_mmtk_plan_marksweep_MSMutator_alloc__IIIII(uintptr_t Mutator, int32_t sz, int32_t align, int32_t offset, int32_t allocator, int32_t site) __attribute__((always_inline));
 extern "C" int32_t JnJVM_org_mmtk_plan_MutatorContext_checkAllocator__III(uintptr_t Mutator, int32_t bytes, int32_t align, int32_t allocator) __attribute__((always_inline));

Modified: vmkit/trunk/mmtk/mmtk-fake/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-fake/Selected.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-fake/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-fake/Selected.cpp Wed Dec 16 15:42:06 2009
@@ -15,7 +15,7 @@
 
 #include <set>
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" gc* internalMalloc(uintptr_t Mutator, int32_t sz, int32_t align,
                               int32_t offset, int32_t allocator,

Modified: vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 struct ActivePlan {
   JavaObject obj;

Modified: vmkit/trunk/mmtk/mmtk-j3/Assert.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Assert.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Assert.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Assert.cpp Wed Dec 16 15:42:06 2009
@@ -10,6 +10,6 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_Assert_dumpStack__ () { JavaThread::get()->printBacktrace(); abort(); }

Modified: vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Collection.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Collection.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Collection.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void JnJVM_org_mmtk_plan_Plan_setCollectionTriggered__();
 

Modified: vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_FinalizableProcessor_clear__ () {
   JavaThread::get()->printBacktrace(); abort();

Modified: vmkit/trunk/mmtk/mmtk-j3/Lock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Lock.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Lock.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Lock.cpp Wed Dec 16 15:42:06 2009
@@ -12,7 +12,7 @@
 #include "JavaThread.h"
 #include "mvm/Threads/Locks.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 struct Lock {
   JavaObject base;

Modified: vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Memory.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Memory.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Memory.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapStartConstant__ () {
   return (uintptr_t)0x30000000;
 }

Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_getArrayBaseOffset__ () {
   return sizeof(JavaObject) + sizeof(ssize_t);

Modified: vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 struct ReferenceProcessor {
   JavaObject obj;

Modified: vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
 #include "JavaClass.h"
 #include "JavaString.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" uint16_t MMTkCharAt(JavaString* str, uint32_t index) {
   return str->value->elements[index];

Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_Scanning_computeThreadRoots__Lorg_mmtk_plan_TraceLocal_2 (JavaObject* Scanning, JavaObject* TL) {
   // When entering this function, all threads are waiting on the rendezvous to

Modified: vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Selected.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Selected.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
 #include "JavaThread.h"
 #include "MutatorThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" JavaObject* Java_org_j3_config_Selected_00024Mutator_get__() {
   return (JavaObject*)mvm::MutatorThread::get()->MutatorContext;

Modified: vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
 #include <sys/time.h>
 #include <ctime>
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_Statistics_perfCtrInit__I (JavaObject* S) {
   // Implement me

Modified: vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Strings.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Strings.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Strings.cpp Wed Dec 16 15:42:06 2009
@@ -12,7 +12,7 @@
 #include "JavaString.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_Strings_write___3CI(JavaObject* str,
                                                      ArrayUInt16* msg,

Modified: vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_SynchronizedCounter_reset__ () { JavaThread::get()->printBacktrace(); abort(); }
 extern "C" void Java_org_j3_mmtk_SynchronizedCounter_increment__ () { JavaThread::get()->printBacktrace(); abort(); }

Modified: vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_mmtk_TraceInterface_gcEnabled__ () { JavaThread::get()->printBacktrace(); abort(); }
 extern "C" void Java_org_j3_mmtk_TraceInterface_adjustSlotOffset__ZLorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 () { JavaThread::get()->printBacktrace(); abort(); }

Modified: vmkit/trunk/mmtk/mmtk-j3/VM.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/VM.cpp?rev=91569&r1=91568&r2=91569&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/VM.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/VM.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
 #include "JavaObject.h"
 #include "JavaThread.h"
 
-using namespace jnjvm;
+using namespace j3;
 
 extern "C" void Java_org_j3_runtime_VM_sysWrite__Lorg_vmmagic_unboxed_Extent_2 () { JavaThread::get()->printBacktrace(); abort(); }
 extern "C" void Java_org_j3_runtime_VM_sysWrite__Lorg_vmmagic_unboxed_Address_2 () { JavaThread::get()->printBacktrace(); abort(); }




From nicolas.geoffray at lip6.fr  Thu Dec 17 13:56:41 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Thu, 17 Dec 2009 21:56:41 -0000
Subject: [vmkit-commits] [vmkit] r91628 - in /vmkit/trunk/lib/J3/Compiler:
 JavaAOTCompiler.cpp JavaJITCompiler.cpp
Message-ID: <200912172156.nBHLuflT005988@zion.cs.uiuc.edu>

Author: geoffray
Date: Thu Dec 17 15:56:40 2009
New Revision: 91628

URL: http://llvm.org/viewvc/llvm-project?rev=91628&view=rev
Log:
Temporary hack in case a class does not imlement a method interface. This
should not happen, but maybe some Java compilers omit the check.


Modified:
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=91628&r1=91627&r2=91628&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Thu Dec 17 15:56:40 2009
@@ -1487,6 +1487,7 @@
         JavaMethod* meth = cl->lookupMethodDontThrow(Imeth->name,
                                                      Imeth->type,
                                                      false, true, 0);
+        assert(meth && "No method found");
         LLVMMethodInfo* LMI = getMethodInfo(meth);
         Function* func = LMI->getMethod();
         IElemts.push_back(ConstantExpr::getBitCast(func, PTy));
@@ -1508,6 +1509,7 @@
         }
 
         if (SameMethod) {
+          assert(methods[0] && "No method found");
           LLVMMethodInfo* LMI = getMethodInfo(methods[0]);
           Function* func = LMI->getMethod();
           IElemts.push_back(ConstantExpr::getBitCast(func, PTy));
@@ -1526,6 +1528,7 @@
                et = methods.end(); it != et; ++it, ++Interf) {
             JavaMethod* Imeth = *Interf;
             JavaMethod* Cmeth = *it;
+            assert(Cmeth && "No method found");
 
             LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
             Function* func = LMI->getMethod();

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=91628&r1=91627&r2=91628&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Thu Dec 17 15:56:40 2009
@@ -255,6 +255,10 @@
 
 }
 
+extern "C" void ThrowUnfoundInterface() {
+  abort();
+}
+
 void JavaJITCompiler::makeIMT(Class* cl) {
   InterfaceMethodTable* IMT = cl->virtualVT->IMT;
   if (!IMT) return;
@@ -272,10 +276,14 @@
       JavaMethod* meth = cl->lookupMethodDontThrow(Imeth->name,
                                                    Imeth->type,
                                                    false, true, 0);
-      LLVMMethodInfo* LMI = getMethodInfo(meth);
-      Function* func = LMI->getMethod();
-      uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
-      IMT->contents[i] = res;
+      if (meth) {
+        LLVMMethodInfo* LMI = getMethodInfo(meth);
+        Function* func = LMI->getMethod();
+        uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+        IMT->contents[i] = res;
+      } else {
+        IMT->contents[i] = (uintptr_t)ThrowUnfoundInterface;
+      }
     } else if (size > 1) {
       std::vector<JavaMethod*> methods;
       bool SameMethod = true;
@@ -289,15 +297,19 @@
        
         if (OldMethod && OldMethod != Cmeth) SameMethod = false;
         else OldMethod = Cmeth;
-        
-        methods.push_back(Cmeth);
+       
+        if (Cmeth) methods.push_back(Cmeth);
       }
 
       if (SameMethod) {
-        LLVMMethodInfo* LMI = getMethodInfo(methods[0]);
-        Function* func = LMI->getMethod();
-        uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
-        IMT->contents[i] = res;
+        if (methods[0]) {
+          LLVMMethodInfo* LMI = getMethodInfo(methods[0]);
+          Function* func = LMI->getMethod();
+          uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+          IMT->contents[i] = res;
+        } else {
+          IMT->contents[i] = (uintptr_t)ThrowUnfoundInterface;
+        }
       } else {
 
         uint32_t length = 2 * size * sizeof(uintptr_t);
@@ -313,12 +325,16 @@
              et = methods.end(); it != et; ++it, j += 2, ++Interf) {
           JavaMethod* Imeth = *Interf;
           JavaMethod* Cmeth = *it;
-          
-          LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
-          Function* func = LMI->getMethod();
-          uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+         
           table[j] = (uintptr_t)Imeth;
-          table[j + 1] = res;
+          if (Cmeth) {
+            LLVMMethodInfo* LMI = getMethodInfo(Cmeth);
+            Function* func = LMI->getMethod();
+            uintptr_t res = (uintptr_t)EE->getPointerToFunctionOrStub(func);
+            table[j + 1] = res;
+          } else {
+            table[j + 1] = (uintptr_t)ThrowUnfoundInterface;
+          }
         }
       }
     }




From nicolas.geoffray at lip6.fr  Sun Dec 20 12:44:07 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Sun, 20 Dec 2009 20:44:07 -0000
Subject: [vmkit-commits] [vmkit] r91793 - in /vmkit/trunk/lib/J3:
 Compiler/JavaAOTCompiler.cpp VMCore/JnjvmClassLoader.h
Message-ID: <200912202044.nBKKi7Ng022894@zion.cs.uiuc.edu>

Author: geoffray
Date: Sun Dec 20 14:44:06 2009
New Revision: 91793

URL: http://llvm.org/viewvc/llvm-project?rev=91793&view=rev
Log:
Verify that we are checking against a real Java object.


Modified:
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=91793&r1=91792&r2=91793&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Sun Dec 20 14:44:06 2009
@@ -2185,7 +2185,7 @@
 
   for (; I != E; ++I) {
     JavaObject* obj = (JavaObject*)(*I);
-    if (obj->instanceOf(cl)) {
+    if (!VMClassLoader::isVMClassLoader(obj) && obj->instanceOf(cl)) {
       if (currentClass) {
         if (obj->getClass() != currentClass) {
           return 0;

Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h?rev=91793&r1=91792&r2=91793&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h Sun Dec 20 14:44:06 2009
@@ -444,6 +444,12 @@
   ///
   static VirtualTable VT;
 
+  /// Is the object a VMClassLoader object?
+  ///
+  static bool isVMClassLoader(JavaObject* obj) {
+    return obj->getVirtualTable() == &VT;
+  }
+
   /// staticTracer - Trace the internal class loader.
   ///
   static void staticTracer(VMClassLoader* obj) {




From nicolas.geoffray at lip6.fr  Fri Dec 25 07:13:25 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Fri, 25 Dec 2009 15:13:25 -0000
Subject: [vmkit-commits] [vmkit] r92161 - /vmkit/trunk/lib/J3/VMCore/Jni.cpp
Message-ID: <200912251513.nBPFDPXu014983@zion.cs.uiuc.edu>

Author: geoffray
Date: Fri Dec 25 09:13:24 2009
New Revision: 92161

URL: http://llvm.org/viewvc/llvm-project?rev=92161&view=rev
Log:
Implement CallVoidMethodA.


Modified:
    vmkit/trunk/lib/J3/VMCore/Jni.cpp

Modified: vmkit/trunk/lib/J3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jni.cpp?rev=92161&r1=92160&r2=92161&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jni.cpp Fri Dec 25 09:13:24 2009
@@ -982,10 +982,31 @@
 }
 
 
-void CallVoidMethodA(JNIEnv *env, jobject obj, jmethodID methodID,
+void CallVoidMethodA(JNIEnv *env, jobject _obj, jmethodID methodID,
                      const jvalue *args) {
-  fprintf(stderr, "Implement me\n");
-  abort();
+  BEGIN_JNI_EXCEPTION
+
+  verifyNull(_obj);
+
+  // Local object references.
+  JavaObject* obj = *(JavaObject**)_obj;
+  llvm_gcroot(obj, 0);
+
+  JavaMethod* meth = (JavaMethod*)methodID;
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
+  
+  Signdef* sign = meth->getSignature();
+  uintptr_t buf = (uintptr_t)alloca(sign->nbArguments * sizeof(uint64));
+  BufToBuf(args, buf, sign);
+  
+  meth->invokeIntVirtualBuf(vm, cl, obj, (void*)buf);
+
+  RETURN_VOID_FROM_JNI;
+
+  END_JNI_EXCEPTION
+  
+  RETURN_VOID_FROM_JNI;
 }
 
 




From nicolas.geoffray at lip6.fr  Thu Dec 31 04:18:25 2009
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Thu, 31 Dec 2009 12:18:25 -0000
Subject: [vmkit-commits] [vmkit] r92356 - in /vmkit/trunk: include/mvm/JIT.h
 lib/J3/Compiler/JavaJIT.h lib/J3/Compiler/JavaJITOpcodes.cpp
 lib/Mvm/Compiler/JIT.cpp
Message-ID: <200912311218.nBVCIPvx021082@zion.cs.uiuc.edu>

Author: geoffray
Date: Thu Dec 31 06:18:25 2009
New Revision: 92356

URL: http://llvm.org/viewvc/llvm-project?rev=92356&view=rev
Log:
Disable metadata for now, llvm is changing its API.


Modified:
    vmkit/trunk/include/mvm/JIT.h
    vmkit/trunk/lib/J3/Compiler/JavaJIT.h
    vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

Modified: vmkit/trunk/include/mvm/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/JIT.h?rev=92356&r1=92355&r2=92356&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/JIT.h (original)
+++ vmkit/trunk/include/mvm/JIT.h Thu Dec 31 06:18:25 2009
@@ -185,7 +185,7 @@
    static llvm::FunctionPassManager* globalFunctionPasses;
    static const llvm::TargetData* TheTargetData;
    static mvm::BumpPtrAllocator* Allocator;
-   static unsigned MetadataTypeKind;
+   //static unsigned MetadataTypeKind;
 
    static uint64 getTypeSize(const llvm::Type* type);
    static void runPasses(llvm::Function* func, llvm::FunctionPassManager*);

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=92356&r1=92355&r2=92356&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Thu Dec 31 06:18:25 2009
@@ -249,10 +249,13 @@
   }
 
   void addHighLevelType(llvm::Instruction* V, CommonClass* cl) {
+    // Enable this when it will be actually used.
+#if 0
     llvm::Value* A[1] = 
       { TheCompiler->getNativeClass(cl ? cl : upcalls->OfObject) };
     llvm::MDNode* Node = llvm::MDNode::get(*llvmContext, A, 1);
-    llvmContext->getMetadata().addMD(module->MetadataTypeKind, Node, V);
+    V->setMetadata(module->MetadataTypeKind, Node);
+#endif
   }
 
   /// pop - Pop a value from the stack and return it.

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=92356&r1=92355&r2=92356&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Thu Dec 31 06:18:25 2009
@@ -171,7 +171,7 @@
     if (currentBlock->getTerminator() != 0) { 
       currentBlock = createBasicBlock("gcj bug");
     }
-#if JNJVM_EXECUTE > 1
+    if (compilingMethod->name->equals(compilingClass->classLoader->asciizConstructUTF8("of")))
     {
       Value* args[3] = {
         ConstantInt::get(Type::getInt32Ty(*llvmContext), (int64_t)bytecodes[i]),
@@ -183,7 +183,6 @@
       CallInst::Create(module->PrintExecutionFunction, args, args + 3, "",
                        currentBlock);
     }
-#endif
     
     switch (bytecodes[i]) {
       

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=92356&r1=92355&r2=92356&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Thu Dec 31 06:18:25 2009
@@ -147,7 +147,7 @@
   mvm::llvm_runtime::makeLLVMModuleContents(globalModule);
   
   LLVMContext& Context = globalModule->getContext();
-  MetadataTypeKind = Context.getMetadata().registerMDKind("HighLevelType");
+  //MetadataTypeKind = Context.getMDKindID("HighLevelType");
   // Type declaration
   ptrType = PointerType::getUnqual(Type::getInt8Ty(Context));
   ptr32Type = PointerType::getUnqual(Type::getInt32Ty(Context));
@@ -450,7 +450,7 @@
 llvm::ExecutionEngine* MvmModule::executionEngine;
 mvm::LockRecursive MvmModule::protectEngine;
 mvm::BumpPtrAllocator* MvmModule::Allocator;
-unsigned MvmModule::MetadataTypeKind;
+//unsigned MvmModule::MetadataTypeKind;
 
 uint64 MvmModule::getTypeSize(const llvm::Type* type) {
   return TheTargetData->getTypeAllocSize(type);