Mercurial > projects > ldc
diff dmd/mars.h @ 1630:44b145be2ef5
Merge dmd 1.056.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Sat, 06 Feb 2010 15:53:52 +0000 |
parents | fb2e6707ad17 |
children | 9bf06e02070b |
line wrap: on
line diff
--- a/dmd/mars.h Wed Jan 06 19:53:35 2010 +0100 +++ b/dmd/mars.h Sat Feb 06 15:53:52 2010 +0000 @@ -1,6 +1,6 @@ // Compiler implementation of the D programming language -// Copyright (c) 1999-2009 by Digital Mars +// Copyright (c) 1999-2010 by Digital Mars // All Rights Reserved // written by Walter Bright // http://www.digitalmars.com @@ -235,7 +235,9 @@ char *deffile; char *resfile; char *exefile; + char *mapfile; +#if IN_LLVM // LDC stuff OUTPUTFLAG output_ll; OUTPUTFLAG output_bc; @@ -250,6 +252,7 @@ const char* llvmArch; const char *targetTriple; const char *dataLayout; +#endif }; struct Global @@ -268,6 +271,7 @@ const char *ddoc_ext; // for Ddoc macro include files const char *hdr_ext; // for D 'header' import files const char *json_ext; // for JSON files + const char *map_ext; // for .map files const char *copyright; const char *written; Array *path; // Array of char*'s which form the import lookup path @@ -393,8 +397,9 @@ LINKwindows, LINKpascal, - // LDC +#if IN_LLVM LINKintrinsic, +#endif }; enum DYNCAST