# HG changeset patch # User Kelly Wilson # Date 1243782633 21600 # Node ID b6aa031644366a2b51fe741c357ef1be3b3bb78e # Parent 0a5f7890f32741a8db5da2746cb6c9b998d2a518 Fix "garbage at end of line" errors on mingw...shouldn't affect linux/macosx diff -r 0a5f7890f327 -r b6aa03164436 gen/rttibuilder.cpp --- a/gen/rttibuilder.cpp Sun May 31 15:27:01 2009 +0200 +++ b/gen/rttibuilder.cpp Sun May 31 09:10:33 2009 -0600 @@ -76,7 +76,7 @@ void RTTIBuilder::push_void_array(llvm::Constant* CI, Type* valtype, Dsymbol* mangle_sym) { std::string initname(mangle_sym->mangle()); - initname.append(".rtti.void[].data"); + initname.append(".rtti.voidarr.data"); LLGlobalVariable* G = new llvm::GlobalVariable( CI->getType(), true, TYPEINFO_LINKAGE_TYPE, CI, initname, gIR->module); @@ -87,9 +87,14 @@ void RTTIBuilder::push_array(llvm::Constant * CI, uint64_t dim, Type* valtype, Dsymbol * mangle_sym) { - std::string initname(mangle_sym?mangle_sym->mangle():".ldc"); + std::string tmpStr(valtype->arrayOf()->toChars()); + tmpStr.erase( remove( tmpStr.begin(), tmpStr.end(), '[' ), tmpStr.end() ); + tmpStr.erase( remove( tmpStr.begin(), tmpStr.end(), ']' ), tmpStr.end() ); + tmpStr.append("arr"); + + std::string initname(mangle_sym?mangle_sym->mangle():".ldc"); initname.append(".rtti."); - initname.append(valtype->arrayOf()->toChars()); + initname.append(tmpStr); initname.append(".data"); LLGlobalVariable* G = new llvm::GlobalVariable(