# HG changeset patch # User Benjamin Kramer # Date 1245159460 -7200 # Node ID 8b9f236dd0515acf26812b4e9bf62e6c1a57acc1 # Parent c3c46399bcf1f643e789c010342a778116809d5c Build fix for LLVM >= r73431 diff -r c3c46399bcf1 -r 8b9f236dd051 gen/tollvm.cpp --- a/gen/tollvm.cpp Tue Jun 16 08:57:20 2009 -0600 +++ b/gen/tollvm.cpp Tue Jun 16 15:37:40 2009 +0200 @@ -399,10 +399,10 @@ ////////////////////////////////////////////////////////////////////////////////////////// -const LLType* DtoSize_t() +const LLIntegerType* DtoSize_t() { // the type of size_t does not change once set - static const LLType* t = NULL; + static const LLIntegerType* t = NULL; if (t == NULL) t = (global.params.is64bit) ? LLType::Int64Ty : LLType::Int32Ty; return t; @@ -563,7 +563,7 @@ return llvm::ConstantInt::get(LLType::Int8Ty, i, false); } -llvm::ConstantFP* DtoConstFP(Type* t, long double value) +LLConstant* DtoConstFP(Type* t, long double value) { const LLType* llty = DtoType(t); assert(llty->isFloatingPoint()); diff -r c3c46399bcf1 -r 8b9f236dd051 gen/tollvm.h --- a/gen/tollvm.h Tue Jun 16 08:57:20 2009 -0600 +++ b/gen/tollvm.h Tue Jun 16 15:37:40 2009 +0200 @@ -37,7 +37,7 @@ LLValue* DtoPointedType(LLValue* ptr, LLValue* val); // some types -const LLType* DtoSize_t(); +const LLIntegerType* DtoSize_t(); const LLStructType* DtoInterfaceInfoType(); const LLStructType* DtoMutexType(); const LLStructType* DtoModuleReferenceType(); @@ -55,7 +55,7 @@ LLConstantInt* DtoConstUint(unsigned i); LLConstantInt* DtoConstInt(int i); LLConstantInt* DtoConstUbyte(unsigned char i); -llvm::ConstantFP* DtoConstFP(Type* t, long double value); +LLConstant* DtoConstFP(Type* t, long double value); LLConstant* DtoConstString(const char*); LLConstant* DtoConstStringPtr(const char* str, const char* section = 0);