# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1223326448 -7200
# Node ID eef8ac26c66c9d50bd45b027017ec8e830a9eccb
# Parent  6aaa3d3c1183e0fc75491feeb7e8b4db2c0766dc
Some missed LLVMDC -> LDC.

diff -r 6aaa3d3c1183 -r eef8ac26c66c LICENSE
--- a/LICENSE	Mon Oct 06 22:46:55 2008 +0200
+++ b/LICENSE	Mon Oct 06 22:54:08 2008 +0200
@@ -1,4 +1,4 @@
-LLVMDC is released under the "three-clause BSD" license reproduced below with 
+LDC is released under the "three-clause BSD" license reproduced below with 
 the following exceptions:
 
 The DMD frontend in dmd/* is originally written by Walter Bright and released
@@ -10,7 +10,7 @@
 
 
 -- "three-clause BSD" --
-Copyright (c) 2007-2008 LLVMDC Team.
+Copyright (c) 2007-2008 LDC Team.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
@@ -21,7 +21,7 @@
     * Redistributions in binary form must reproduce the above copyright notice, this
       list of conditions and the following disclaimer in the documentation and/or 
       other materials provided with the distribution.
-    * Neither the name of the LLVMDC Team nor the names of its contributors may be 
+    * Neither the name of the LDC Team nor the names of its contributors may be 
       used to endorse or promote products derived from this software without specific
       prior written permission.
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c demos/ray.d
--- a/demos/ray.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/demos/ray.d	Mon Oct 06 22:54:08 2008 +0200
@@ -13,7 +13,7 @@
     return !neg ? i : -i;
 }
 
-version(LLVMDC)
+version(LDC)
 {
 pragma(intrinsic, "llvm.sqrt.f64")
 double sqrt(double val);
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/arrayop.c
--- a/dmd/arrayop.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/arrayop.c	Mon Oct 06 22:54:08 2008 +0200
@@ -308,7 +308,7 @@
 	else
 	{   /* In library, refer to it.
 	     */
-        // LLVMDC FIXME   
+        // LDC FIXME   
 	    fd = FuncDeclaration::genCfunc(NULL, type, name);
 	}
 	sv->ptrvalue = fd;	// cache symbol in hash table
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/cast.c
--- a/dmd/cast.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/cast.c	Mon Oct 06 22:54:08 2008 +0200
@@ -1183,7 +1183,7 @@
 	stride = t1b->nextOf()->size(loc);
 	if (!t->equals(t2b))
 	    e2 = e2->castTo(sc, t);
-    // LLVMDC: llvm uses typesafe pointer arithmetic
+    // LDC: llvm uses typesafe pointer arithmetic
     #if !IN_LLVM
 	if (t1b->next->isbit())
 	    // BUG: should add runtime check for misaligned offsets
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/cond.c
--- a/dmd/cond.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/cond.c	Mon Oct 06 22:54:08 2008 +0200
@@ -127,7 +127,7 @@
 {
     static char* reserved[] =
     {
-	"DigitalMars", "LLVM", "LLVMDC", "LLVM64",
+	"DigitalMars", "LLVM", "LDC", "LLVM64",
     "X86", "X86_64", "PPC", "PPC64",
 	"Windows", "Win32", "Win64",
 	"linux", "darwin", "Posix",
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/expression.c
--- a/dmd/expression.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/expression.c	Mon Oct 06 22:54:08 2008 +0200
@@ -267,7 +267,7 @@
 			//printf("rewriting e1 to %s's this\n", f->toChars());
 			n++;
 
-            // LLVMDC seems dmd misses it sometimes here :/
+            // LDC seems dmd misses it sometimes here :/
             f->vthis->nestedref = 1;
 
 			e1 = new VarExp(loc, f->vthis);
@@ -3756,7 +3756,7 @@
 #endif
     }
 
-    // LLVMDC: Fixes bug 1161, http://d.puremagic.com/issues/show_bug.cgi?id=1161
+    // LDC: Fixes bug 1161, http://d.puremagic.com/issues/show_bug.cgi?id=1161
     // check access to VarDeclaration
     accessCheck(loc, sc, NULL, var);
 
@@ -5555,7 +5555,7 @@
     if (!type)
     {
 	e1 = e1->semantic(sc);
-    // LLVMDC we need a copy as we store the LLVM tpye in TypeFunction, and delegate/members have different types for 'this'
+    // LDC we need a copy as we store the LLVM tpye in TypeFunction, and delegate/members have different types for 'this'
 	type = new TypeDelegate(func->type->syntaxCopy());
 	type = type->semantic(loc, sc);
 	AggregateDeclaration *ad = func->toParent()->isAggregateDeclaration();
@@ -6223,7 +6223,7 @@
 	    FuncDeclaration *f = dve->var->isFuncDeclaration();
         VarDeclaration *v = dve->var->isVarDeclaration();
 
-        // LLVMDC
+        // LDC
         if (f && f->isIntrinsic())
         {
             error("cannot take the address of intrinsic function %s", e1->toChars());
@@ -7843,7 +7843,7 @@
     e1->checkIntegral();
     e2 = e2->checkIntegral();
     //e2 = e2->castTo(sc, Type::tshiftcnt);
-    e2 = e2->castTo(sc, e1->type); // LLVMDC
+    e2 = e2->castTo(sc, e1->type); // LDC
     return this;
 }
 
@@ -7872,7 +7872,7 @@
     e1->checkIntegral();
     e2 = e2->checkIntegral();
     //e2 = e2->castTo(sc, Type::tshiftcnt);
-    e2 = e2->castTo(sc, e1->type); // LLVMDC
+    e2 = e2->castTo(sc, e1->type); // LDC
     return this;
 }
 
@@ -7901,7 +7901,7 @@
     e1->checkIntegral();
     e2 = e2->checkIntegral();
     //e2 = e2->castTo(sc, Type::tshiftcnt);
-    e2 = e2->castTo(sc, e1->type); // LLVMDC
+    e2 = e2->castTo(sc, e1->type); // LDC
     return this;
 }
 
@@ -8389,7 +8389,7 @@
 	e2 = e2->checkIntegral();
 	e1 = e1->integralPromotions(sc);
 	//e2 = e2->castTo(sc, Type::tshiftcnt);
-    e2 = e2->castTo(sc, e1->type); // LLVMDC
+    e2 = e2->castTo(sc, e1->type); // LDC
 	type = e1->type;
     }
     return this;
@@ -8414,7 +8414,7 @@
 	e2 = e2->checkIntegral();
 	e1 = e1->integralPromotions(sc);
 	//e2 = e2->castTo(sc, Type::tshiftcnt);
-    e2 = e2->castTo(sc, e1->type); // LLVMDC
+    e2 = e2->castTo(sc, e1->type); // LDC
 	type = e1->type;
     }
     return this;
@@ -8439,7 +8439,7 @@
 	e2 = e2->checkIntegral();
 	e1 = e1->integralPromotions(sc);
 	//e2 = e2->castTo(sc, Type::tshiftcnt);
-    e2 = e2->castTo(sc, e1->type); // LLVMDC
+    e2 = e2->castTo(sc, e1->type); // LDC
 	type = e1->type;
     }
     return this;
@@ -9092,7 +9092,7 @@
 
 #if IN_LLVM
 
-// Strictly LLVMDC specific stuff
+// Strictly LDC specific stuff
 
 GEPExp::GEPExp(Loc loc, Expression* e, Identifier* id, unsigned idx)
     : UnaExp(loc, TOKgep, sizeof(GEPExp), e)
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/expression.h
--- a/dmd/expression.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/expression.h	Mon Oct 06 22:54:08 2008 +0200
@@ -158,7 +158,7 @@
     // Back end
     virtual elem *toElem(IRState *irs);
     virtual dt_t **toDt(dt_t **pdt);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -185,7 +185,7 @@
     Expression *toLvalue(Scope *sc, Expression *e);
     elem *toElem(IRState *irs);
     dt_t **toDt(dt_t **pdt);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -210,7 +210,7 @@
     void toMangleBuffer(OutBuffer *buf);
     elem *toElem(IRState *irs);
     dt_t **toDt(dt_t **pdt);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -238,7 +238,7 @@
 #endif
     elem *toElem(IRState *irs);
     dt_t **toDt(dt_t **pdt);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -317,7 +317,7 @@
     Expression *interpret(InterState *istate);
     elem *toElem(IRState *irs);
     dt_t **toDt(dt_t **pdt);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -347,7 +347,7 @@
     void toMangleBuffer(OutBuffer *buf);
     elem *toElem(IRState *irs);
     dt_t **toDt(dt_t **pdt);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -400,7 +400,7 @@
     int inlineCost(InlineCostState *ics);
     Expression *doInline(InlineDoState *ids);
     Expression *inlineScan(InlineScanState *iss);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -427,7 +427,7 @@
     int inlineCost(InlineCostState *ics);
     Expression *doInline(InlineDoState *ids);
     Expression *inlineScan(InlineScanState *iss);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -460,7 +460,7 @@
     int inlineCost(InlineCostState *ics);
     Expression *doInline(InlineDoState *ids);
     Expression *inlineScan(InlineScanState *iss);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -594,7 +594,7 @@
     int inlineCost(InlineCostState *ics);
     Expression *doInline(InlineDoState *ids);
     //Expression *inlineScan(InlineScanState *iss);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -826,7 +826,7 @@
     void dump(int indent);
     elem *toElem(IRState *irs);
 
-    //LLVMDC: since we don't convert abc.def -> *(&abc + ABC.def.offsetof)
+    //LDC: since we don't convert abc.def -> *(&abc + ABC.def.offsetof)
     // these are needed
     Expression *optimize(int result);
     Expression *interpret(InterState *istate);
@@ -901,7 +901,7 @@
     MATCH implicitConvTo(Type *t);
     Expression *castTo(Scope *sc, Type *t);
     Expression *optimize(int result);
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -1004,7 +1004,7 @@
     // For operator overloading
     Identifier *opId();
 
-    // LLVMDC
+    // LDC
     virtual llvm::Constant *toConstElem(IRState *irs);
 };
 
@@ -1501,7 +1501,7 @@
 
 #if IN_LLVM
 
-// this stuff is strictly LLVMDC
+// this stuff is strictly LDC
 
 struct GEPExp : UnaExp
 {
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/func.c
--- a/dmd/func.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/func.c	Mon Oct 06 22:54:08 2008 +0200
@@ -94,7 +94,7 @@
     f->fbody    = fbody    ? fbody->syntaxCopy()    : NULL;
     assert(!fthrows); // deprecated
 
-    // LLVMDC
+    // LDC
     f->intrinsicName = intrinsicName;
 
     return f;
@@ -2020,7 +2020,7 @@
  */
 
 //
-// LLVMDC: Adjusted to give argument info to the runtime function decl.
+// LDC: Adjusted to give argument info to the runtime function decl.
 //
 
 FuncDeclaration *FuncDeclaration::genCfunc(Arguments *args, Type *treturn, char *name)
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/lexer.c
--- a/dmd/lexer.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/lexer.c	Mon Oct 06 22:54:08 2008 +0200
@@ -702,7 +702,7 @@
 		    }
 		    else if (id == Id::VENDOR)
 		    {
-			t->ustring = (unsigned char *)"LLVMDC";
+			t->ustring = (unsigned char *)"LDC";
 			goto Lstring;
 		    }
 		    else if (id == Id::TIMESTAMP)
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/lexer.h
--- a/dmd/lexer.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/lexer.h	Mon Oct 06 22:54:08 2008 +0200
@@ -161,7 +161,7 @@
     TOKshared,
 #endif
 
-// LLVMDC specific
+// LDC specific
 #if IN_LLVM
     TOKgep,
 #endif
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/module.c
--- a/dmd/module.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/module.c	Mon Oct 06 22:54:08 2008 +0200
@@ -122,7 +122,7 @@
     }
     srcfile = new File(srcfilename);
 
-    // LLVMDC
+    // LDC
     llvmForceLogging = false;
     this->doDocComment = doDocComment;
     this->doHdrGen = doHdrGen;
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/module.h
--- a/dmd/module.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/module.h	Mon Oct 06 22:54:08 2008 +0200
@@ -169,7 +169,7 @@
     Symbol *toSymbol();
     void genmoduleinfo();
 
-    // LLVMDC
+    // LDC
     void buildTargetFiles();
     File* buildFilePath(char* forcename, char* path, char* ext);
     Module *isModule() { return this; }
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/mtype.c
--- a/dmd/mtype.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/mtype.c	Mon Oct 06 22:54:08 2008 +0200
@@ -103,7 +103,7 @@
 ClassDeclaration *Type::typeinfodelegate;
 ClassDeclaration *Type::typeinfotypelist;
 
-// LLVMDC
+// LDC
 Type* Type::topaque;
 
 Type *Type::tvoidptr;
@@ -210,7 +210,7 @@
     mangleChar[Ttuple] = 'B';
     mangleChar[Tslice] = '@';
 
-    // LLVMDC
+    // LDC
     mangleChar[Topaque] = 'O';
 
     for (i = 0; i < TMAX; i++)
@@ -234,7 +234,7 @@
 
     tvoidptr = tvoid->pointerTo();
 
-    // LLVMDC
+    // LDC
     topaque = new TypeOpaque();
 
     // set size_t / ptrdiff_t types and pointer size
@@ -726,7 +726,7 @@
     name = (char *)alloca(19 + sizeof(len) * 3 + len + 1);
     buf.writeByte(0);
     sprintf(name, "_D%dTypeInfo_%s6__initZ", 9 + len, buf.data);
-// LLVMDC
+// LDC
 // it is not clear where the underscore that's stripped here is added back in
 //    if (global.params.isWindows)
 //	name++;			// C mangling will add it back in
@@ -1002,7 +1002,7 @@
 
     switch (ty)
     {
-//LLVMDC: llvm aligns 12 byte reals to 4 byte
+//LDC: llvm aligns 12 byte reals to 4 byte
 	case Tfloat80:
 	case Timaginary80:
 	case Tcomplex80:
@@ -1010,7 +1010,7 @@
 	    sz = 4;
 	    break;
 
-//LLVMDC: llvm aligns these to 4 byte boundaries
+//LDC: llvm aligns these to 4 byte boundaries
 	case Tint64:
 	case Tuns64:
 	case Tfloat64:
@@ -1554,7 +1554,7 @@
 	Expression *ec;
 	Expressions *arguments;
 
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *adReverseChar_fd = NULL;
 	if(!adReverseChar_fd) {
 	    Arguments* args = new Arguments;
@@ -1585,7 +1585,7 @@
 	Expression *ec;
 	Expressions *arguments;
 
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *adSortChar_fd = NULL;
 	if(!adSortChar_fd) {
 	    Arguments* args = new Arguments;
@@ -1620,7 +1620,7 @@
 
 	assert(size);
 	dup = (ident == Id::dup);
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *adDup_fd = NULL;
 	if(!adDup_fd) {
 	    Arguments* args = new Arguments;
@@ -1656,7 +1656,7 @@
 	Expressions *arguments;
 	bool isBit = (n->ty == Tbit);
 
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *adSort_fd = NULL;
 	if(!adSort_fd) {
 	    Arguments* args = new Arguments;
@@ -1680,7 +1680,7 @@
 	arguments = new Expressions();
 	arguments->push(e);
     if (next->ty != Tbit)
-        arguments->push(n->getTypeInfo(sc));   // LLVMDC, we don't support the getInternalTypeInfo
+        arguments->push(n->getTypeInfo(sc));   // LDC, we don't support the getInternalTypeInfo
                                                // optimization arbitrarily, not yet at least...
 	e = new CallExp(e->loc, ec, arguments);
 	e->type = next->arrayOf();
@@ -2346,7 +2346,7 @@
 	Expression *ec;
 	Expressions *arguments;
 
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *aaLen_fd = NULL;
 	if(!aaLen_fd) {
 	    Arguments* args = new Arguments;
@@ -2367,7 +2367,7 @@
 	int size = key->size(e->loc);
 
 	assert(size);
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *aaKeys_fd = NULL;
 	if(!aaKeys_fd) {
 	    Arguments* args = new Arguments;
@@ -2388,7 +2388,7 @@
 	Expression *ec;
 	Expressions *arguments;
 
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *aaValues_fd = NULL;
 	if(!aaValues_fd) {
 	    Arguments* args = new Arguments;
@@ -2413,7 +2413,7 @@
 	Expression *ec;
 	Expressions *arguments;
 
-	//LLVMDC: Build arguments.
+	//LDC: Build arguments.
 	static FuncDeclaration *aaRehash_fd = NULL;
 	if(!aaRehash_fd) {
 	    Arguments* args = new Arguments;
@@ -4465,7 +4465,7 @@
 	// *(&e + offset)
 	accessCheck(e->loc, sc, e, d);
 
-// LLVMDC we don't want dot exprs turned into pointer arithmetic. it complicates things for no apparent gain
+// LDC we don't want dot exprs turned into pointer arithmetic. it complicates things for no apparent gain
 #ifndef IN_LLVM
 	b = new AddrExp(e->loc, e);
 	b->type = e->type->pointerTo();
@@ -4730,7 +4730,7 @@
 		e = new PtrExp(e->loc, e, t);
         }
 
-#endif // !LLVMDC
+#endif // !LDC
 
 	    return e;
 	}
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/statement.c
--- a/dmd/statement.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/statement.c	Mon Oct 06 22:54:08 2008 +0200
@@ -1598,7 +1598,7 @@
 		/* Call:
 		 *	_aaApply(aggr, keysize, flde)
 		 */
-		//LLVMDC: Build arguments.
+		//LDC: Build arguments.
 		static FuncDeclaration *aaApply2_fd = NULL;
 		if(!aaApply2_fd) {
 		    Arguments* args = new Arguments;
@@ -1667,7 +1667,7 @@
 		const char *r = (op == TOKforeach_reverse) ? "R" : "";
 		int j = sprintf(fdname, "_aApply%s%.*s%d", r, 2, fntab[flag], dim);
 		assert(j < sizeof(fdname));
-		//LLVMDC: Build arguments.
+		//LDC: Build arguments.
 		Arguments* args = new Arguments;
 		args->push(new Argument(STCin, Type::topaque->arrayOf(), NULL, NULL));
 		if (dim == 2) {
@@ -2243,7 +2243,7 @@
     sdefault = NULL;
     cases = NULL;
     hasNoDefault = 0;
-    // LLVMDC
+    // LDC
     enclosinghandler = NULL;
 }
 
@@ -3200,7 +3200,7 @@
     this->body = body;
     this->esync = NULL;
     this->enclosinghandler = NULL;
-    // LLVMDC
+    // LDC
     this->llsync = NULL;
 }
 
@@ -3211,7 +3211,7 @@
     this->body = body;
     this->esync = esync;
     this->enclosinghandler = NULL;
-    // LLVMDC
+    // LDC
     this->llsync = NULL;
 }
 
@@ -3961,7 +3961,7 @@
 	statement = statement->semantic(sc);
     sc->pop();
 
-    // LLVMDC put in labmap
+    // LDC put in labmap
     fd->labmap[ident->toChars()] = this;
 
     return this;
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/statement.h
--- a/dmd/statement.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/statement.h	Mon Oct 06 22:54:08 2008 +0200
@@ -94,7 +94,7 @@
     BEany = (BEfallthru | BEthrow | BEreturn | BEgoto | BEhalt),
 };
 
-// LLVMDC this is used for tracking try-finally, synchronized and volatile scopes
+// LDC this is used for tracking try-finally, synchronized and volatile scopes
 // definitions in gen/llvmhelpers.cpp
 struct EnclosingHandler : Object
 {
@@ -544,7 +544,7 @@
 
     CaseStatement* isCaseStatement() { return this; }
 
-    // LLVMDC
+    // LDC
     llvm::BasicBlock* bodyBB;
     llvm::ConstantInt* llvmIdx;
 };
@@ -570,7 +570,7 @@
 
     void toIR(IRState *irs);
 
-    // LLVMDC
+    // LDC
     llvm::BasicBlock* bodyBB;
 };
 
@@ -655,7 +655,7 @@
 
     void toIR(IRState *irs);
 
-    // LLVMDC: only set if ident is set: label statement to jump to
+    // LDC: only set if ident is set: label statement to jump to
     LabelStatement *target;
 };
 
@@ -674,7 +674,7 @@
 
     void toIR(IRState *irs);
 
-    // LLVMDC: only set if ident is set: label statement to jump to
+    // LDC: only set if ident is set: label statement to jump to
     LabelStatement *target;
 };
 
@@ -871,7 +871,7 @@
 
     void toIR(IRState *irs);
 
-    // LLVMDC
+    // LDC
     bool asmLabel;       // for labels inside inline assembler
 };
 
@@ -903,7 +903,7 @@
 
     void toIR(IRState *irs);
 
-    // LLVMDC
+    // LDC
     // non-zero if this is a branch, contains the target labels identifier
     Identifier* isBranchToLabel;
 };
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/template.c
--- a/dmd/template.c	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/template.c	Mon Oct 06 22:54:08 2008 +0200
@@ -304,7 +304,7 @@
     d = Dsymbol::arraySyntaxCopy(members);
     td = new TemplateDeclaration(loc, ident, p, d);
     
-    // LLVMDC
+    // LDC
     td->intrinsicName = intrinsicName;
     
     return td;
diff -r 6aaa3d3c1183 -r eef8ac26c66c dmd/template.h
--- a/dmd/template.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/dmd/template.h	Mon Oct 06 22:54:08 2008 +0200
@@ -86,7 +86,7 @@
     TemplateTupleParameter *isVariadic();
     int isOverloadable();
     
-    // LLVMDC
+    // LDC
     std::string intrinsicName;
 };
 
@@ -315,7 +315,7 @@
     TemplateInstance *isTemplateInstance() { return this; }
     AliasDeclaration *isAliasDeclaration();
 
-    // LLVMDC
+    // LDC
     TemplateInstance *tinst; // enclosing template instance
     void printInstantiationTrace();
 };
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/aa.h
--- a/gen/aa.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/aa.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,8 +1,8 @@
-#ifndef LLVMDC_GEN_AA_H
-#define LLVMDC_GEN_AA_H
+#ifndef LDC_GEN_AA_H
+#define LDC_GEN_AA_H
 
 DValue* DtoAAIndex(Loc& loc, Type* type, DValue* aa, DValue* key, bool lvalue);
 DValue* DtoAAIn(Loc& loc, Type* type, DValue* aa, DValue* key);
 void DtoAARemove(Loc& loc, DValue* aa, DValue* key);
 
-#endif // LLVMDC_GEN_AA_H
+#endif // LDC_GEN_AA_H
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/classes.h
--- a/gen/classes.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/classes.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_CLASSES_H
-#define LLVMDC_GEN_CLASSES_H
+#ifndef LDC_GEN_CLASSES_H
+#define LDC_GEN_CLASSES_H
 
 #include "gen/structs.h"
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/complex.h
--- a/gen/complex.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/complex.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_COMPLEX_H
-#define LLVMDC_GEN_COMPLEX_H
+#ifndef LDC_GEN_COMPLEX_H
+#define LDC_GEN_COMPLEX_H
 
 const llvm::StructType* DtoComplexType(Type* t);
 const LLType* DtoComplexBaseType(Type* t);
@@ -26,4 +26,4 @@
 
 DValue* DtoCastComplex(Loc& loc, DValue* val, Type* to);
 
-#endif // LLVMDC_GEN_COMPLEX_H
+#endif // LDC_GEN_COMPLEX_H
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/dvalue.h
--- a/gen/dvalue.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/dvalue.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_DVALUE_H
-#define LLVMDC_GEN_DVALUE_H
+#ifndef LDC_GEN_DVALUE_H
+#define LDC_GEN_DVALUE_H
 
 /*
 These classes are used for generating the IR. They encapsulate D values and
@@ -168,4 +168,4 @@
     virtual DLRValue* isLRValue() { return this; }
 };
 
-#endif // LLVMDC_GEN_DVALUE_H
+#endif // LDC_GEN_DVALUE_H
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/functions.h
--- a/gen/functions.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/functions.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_FUNCTIONS_H
-#define LLVMDC_GEN_FUNCTIONS_H
+#ifndef LDC_GEN_FUNCTIONS_H
+#define LDC_GEN_FUNCTIONS_H
 
 const llvm::FunctionType* DtoFunctionType(Type* t, const LLType* thistype, const LLType* nesttype, bool ismain = false);
 const llvm::FunctionType* DtoFunctionType(FuncDeclaration* fdecl);
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/irstate.h
--- a/gen/irstate.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/irstate.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_IRSTATE_H
-#define LLVMDC_GEN_IRSTATE_H
+#ifndef LDC_GEN_IRSTATE_H
+#define LDC_GEN_IRSTATE_H
 
 #include <vector>
 #include <list>
@@ -234,4 +234,4 @@
         return new CallOrInvoke_Call(ir->CreateCall(Callee, ArgBegin, ArgEnd, Name));
 }
 
-#endif // LLVMDC_GEN_IRSTATE_H
+#endif // LDC_GEN_IRSTATE_H
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/linker.h
--- a/gen/linker.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/linker.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_LINKER_H
-#define LLVMDC_GEN_LINKER_H
+#ifndef LDC_GEN_LINKER_H
+#define LDC_GEN_LINKER_H
 
 #include <vector>
 
@@ -33,4 +33,4 @@
  */
 int runExectuable();
 
-#endif // LLVMDC_GEN_LINKER_H
+#endif // LDC_GEN_LINKER_H
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/llvmhelpers.h
--- a/gen/llvmhelpers.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/llvmhelpers.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_LLVMHELPERS_H
-#define LLVMDC_GEN_LLVMHELPERS_H
+#ifndef LDC_GEN_LLVMHELPERS_H
+#define LDC_GEN_LLVMHELPERS_H
 
 #include "gen/llvm.h"
 #include "statement.h"
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/todebug.h
--- a/gen/todebug.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/todebug.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_TODEBUG_H
-#define LLVMDC_GEN_TODEBUG_H
+#ifndef LDC_GEN_TODEBUG_H
+#define LDC_GEN_TODEBUG_H
 
 void RegisterDwarfSymbols(llvm::Module* mod);
 
@@ -37,6 +37,6 @@
  */
 LLGlobalVariable* DtoDwarfGlobalVariable(LLGlobalVariable* ll, VarDeclaration* vd);
 
-#endif // LLVMDC_GEN_TODEBUG_H
+#endif // LDC_GEN_TODEBUG_H
 
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/tollvm.h
--- a/gen/tollvm.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/tollvm.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_TOLLVM_H
-#define LLVMDC_GEN_TOLLVM_H
+#ifndef LDC_GEN_TOLLVM_H
+#define LDC_GEN_TOLLVM_H
 
 #include "gen/llvm.h"
 #include "lexer.h"
@@ -144,4 +144,4 @@
 
 #include "enums.h"
 
-#endif // LLVMDC_GEN_TOLLVM_H
+#endif // LDC_GEN_TOLLVM_H
diff -r 6aaa3d3c1183 -r eef8ac26c66c gen/typeinf.h
--- a/gen/typeinf.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/gen/typeinf.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_GEN_TYPEINF_H
-#define LLVMDC_GEN_TYPEINF_H
+#ifndef LDC_GEN_TYPEINF_H
+#define LDC_GEN_TYPEINF_H
 
 void DtoResolveTypeInfo(TypeInfoDeclaration* tid);
 void DtoDeclareTypeInfo(TypeInfoDeclaration* tid);
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/ir.h
--- a/ir/ir.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/ir.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,7 +1,7 @@
 // this head contains stuff used by all the IR
 
-#ifndef LLVMDC_IR_IR_H
-#define LLVMDC_IR_IR_H
+#ifndef LDC_IR_IR_H
+#define LDC_IR_IR_H
 
 #include "ir/irforw.h"
 #include "root.h"
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irforw.h
--- a/ir/irforw.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irforw.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRFORW_H
-#define LLVMDC_IR_IRFORW_H
+#ifndef LDC_IR_IRFORW_H
+#define LDC_IR_IRFORW_H
 
 // dmd forward declarations
 struct Module;
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irfunction.h
--- a/ir/irfunction.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irfunction.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRFUNCTION_H
-#define LLVMDC_IR_IRFUNCTION_H
+#ifndef LDC_IR_IRFUNCTION_H
+#define LDC_IR_IRFUNCTION_H
 
 #include "ir/ir.h"
 #include "ir/irlandingpad.h"
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irlandingpad.h
--- a/ir/irlandingpad.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irlandingpad.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRLANDINGPADINFO_H
-#define LLVMDC_IR_IRLANDINGPADINFO_H
+#ifndef LDC_IR_IRLANDINGPADINFO_H
+#define LDC_IR_IRLANDINGPADINFO_H
 
 #include "ir/ir.h"
 #include "statement.h"
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irmodule.h
--- a/ir/irmodule.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irmodule.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRMODULE_H
-#define LLVMDC_IR_IRMODULE_H
+#ifndef LDC_IR_IRMODULE_H
+#define LDC_IR_IRMODULE_H
 
 #include "ir/ir.h"
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irstruct.h
--- a/ir/irstruct.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irstruct.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRSTRUCT_H
-#define LLVMDC_IR_IRSTRUCT_H
+#ifndef LDC_IR_IRSTRUCT_H
+#define LDC_IR_IRSTRUCT_H
 
 #include "ir/ir.h"
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irsymbol.h
--- a/ir/irsymbol.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irsymbol.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRSYMBOL_H
-#define LLVMDC_IR_IRSYMBOL_H
+#ifndef LDC_IR_IRSYMBOL_H
+#define LDC_IR_IRSYMBOL_H
 
 #include <set>
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irtype.h
--- a/ir/irtype.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irtype.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRTYPE_H
-#define LLVMDC_IR_IRTYPE_H
+#ifndef LDC_IR_IRTYPE_H
+#define LDC_IR_IRTYPE_H
 
 #include <set>
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c ir/irvar.h
--- a/ir/irvar.h	Mon Oct 06 22:46:55 2008 +0200
+++ b/ir/irvar.h	Mon Oct 06 22:54:08 2008 +0200
@@ -1,5 +1,5 @@
-#ifndef LLVMDC_IR_IRVAR_H
-#define LLVMDC_IR_IRVAR_H
+#ifndef LDC_IR_IRVAR_H
+#define LDC_IR_IRVAR_H
 
 #include "ir/ir.h"
 #include "llvm/Type.h"
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/internal/aaA.d
--- a/lphobos/internal/aaA.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/internal/aaA.d	Mon Oct 06 22:54:08 2008 +0200
@@ -28,7 +28,7 @@
  */
 
 /*
- * Modified for LLVMDC by Tomas Lindquist Olsen.
+ * Modified for LDC by Tomas Lindquist Olsen.
  * The DMD implementation wont quite work due to the differences in how
  * structs are handled.
  */
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/internal/objectimpl.d
--- a/lphobos/internal/objectimpl.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/internal/objectimpl.d	Mon Oct 06 22:54:08 2008 +0200
@@ -33,7 +33,7 @@
  */
 
 /*
- * This copy is modified to work with LLVMDC
+ * This copy is modified to work with LDC
  * by Tomas Lindquist Olsen, September 2007
  */
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/std/format.d
--- a/lphobos/std/format.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/std/format.d	Mon Oct 06 22:54:08 2008 +0200
@@ -12,7 +12,7 @@
 /*
  *  Copyright (C) 2004-2006 by Digital Mars, www.digitalmars.com
  *  Written by Walter Bright
- *  Modified for LLVMDC by Tomas Lindquist Olsen
+ *  Modified for LDC by Tomas Lindquist Olsen
  *
  *  This software is provided 'as-is', without any express or implied
  *  warranty. In no event will the authors be held liable for any damages
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/std/intrinsic.d
--- a/lphobos/std/intrinsic.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/std/intrinsic.d	Mon Oct 06 22:54:08 2008 +0200
@@ -7,7 +7,7 @@
 /* NOTE: This file has been patched from the original DMD distribution to
    work with the GDC compiler.
    NOTE: This file has been patched from the original GDC distribution to
-   work with the LLVMDC compiler.
+   work with the LDC compiler.
 
    Modified by David Friedman, May 2006
    Modified by Tomas Lindquist Olsen, August 2007
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/std/moduleinit.d
--- a/lphobos/std/moduleinit.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/std/moduleinit.d	Mon Oct 06 22:54:08 2008 +0200
@@ -1,4 +1,4 @@
-// Modified for LLVMDC
+// Modified for LDC
 
 module std.moduleinit;
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/std/stdarg.d
--- a/lphobos/std/stdarg.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/std/stdarg.d	Mon Oct 06 22:54:08 2008 +0200
@@ -6,7 +6,7 @@
 
 /* This is for use with variable argument lists with extern(D) linkage. */
 
-/* Modified for LLVMDC (LLVM D Compiler) by Tomas Lindquist Olsen, 2007 */
+/* Modified for LDC (LLVM D Compiler) by Tomas Lindquist Olsen, 2007 */
 
 module std.stdarg;
 
diff -r 6aaa3d3c1183 -r eef8ac26c66c lphobos/std/stdint.d
--- a/lphobos/std/stdint.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/lphobos/std/stdint.d	Mon Oct 06 22:54:08 2008 +0200
@@ -119,7 +119,7 @@
 
 /*
     NOTE: This file has been patched from the original DMD distribution to
-    work with the LLVMDC compiler.
+    work with the LDC compiler.
 
     Modified by Tomas Lindquist Olsen, August 2007
 */
diff -r 6aaa3d3c1183 -r eef8ac26c66c runtime/internal/aaA.d
--- a/runtime/internal/aaA.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/runtime/internal/aaA.d	Mon Oct 06 22:54:08 2008 +0200
@@ -29,7 +29,7 @@
 
 /*
  *  Modified by Sean Kelly <sean@f4.ca> for use with Tango.
- *  Modified by Tomas Lindquist Olsen <tomas@famolsen.dk> for use with LLVMDC.
+ *  Modified by Tomas Lindquist Olsen <tomas@famolsen.dk> for use with LDC.
  */
 
 private
@@ -90,7 +90,7 @@
  * it is completely opaque.
  */
 
-// LLVMDC doesn't pass structs in registers so no need to wrap it ...
+// LDC doesn't pass structs in registers so no need to wrap it ...
 alias BB* AA;
 
 /**********************************
diff -r 6aaa3d3c1183 -r eef8ac26c66c runtime/internal/genobj.d
--- a/runtime/internal/genobj.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/runtime/internal/genobj.d	Mon Oct 06 22:54:08 2008 +0200
@@ -33,7 +33,7 @@
 
 /*
  *  Modified by Sean Kelly <sean@f4.ca> for use with Tango.
- *  Modified by Tomas Lindquist Olsen <tomas@famolsen.dk> for use with LLVMDC.
+ *  Modified by Tomas Lindquist Olsen <tomas@famolsen.dk> for use with LDC.
  */
 
 module object;
diff -r 6aaa3d3c1183 -r eef8ac26c66c runtime/internal/memory.d
--- a/runtime/internal/memory.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/runtime/internal/memory.d	Mon Oct 06 22:54:08 2008 +0200
@@ -60,7 +60,7 @@
             import tango.stdc.posix.dlfcn;
         }
     }
-    version(LLVMDC)
+    version(LDC)
     {
         pragma(intrinsic, "llvm.frameaddress")
         {
@@ -122,7 +122,7 @@
  */
 extern (C) void* rt_stackTop()
 {
-    version(LLVMDC)
+    version(LDC)
     {
         return llvm_frameaddress();
     }
diff -r 6aaa3d3c1183 -r eef8ac26c66c tests/minicomplex/l.d
--- a/tests/minicomplex/l.d	Mon Oct 06 22:46:55 2008 +0200
+++ b/tests/minicomplex/l.d	Mon Oct 06 22:54:08 2008 +0200
@@ -2,5 +2,5 @@
 
 void main()
 {
-    Cout("Hi, says LLVMDC + Tango").newline;
+    Cout("Hi, says LDC + Tango").newline;
 }