Mercurial > projects > ldc
comparison 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 |
comparison
equal
deleted
inserted
replaced
1629:b07d683ba4d0 | 1630:44b145be2ef5 |
---|---|
1 | 1 |
2 // Compiler implementation of the D programming language | 2 // Compiler implementation of the D programming language |
3 // Copyright (c) 1999-2009 by Digital Mars | 3 // Copyright (c) 1999-2010 by Digital Mars |
4 // All Rights Reserved | 4 // All Rights Reserved |
5 // written by Walter Bright | 5 // written by Walter Bright |
6 // http://www.digitalmars.com | 6 // http://www.digitalmars.com |
7 // License for redistribution is by either the Artistic License | 7 // License for redistribution is by either the Artistic License |
8 // in artistic.txt, or the GNU General Public License in gnu.txt. | 8 // in artistic.txt, or the GNU General Public License in gnu.txt. |
233 Array *linkswitches; | 233 Array *linkswitches; |
234 Array *libfiles; | 234 Array *libfiles; |
235 char *deffile; | 235 char *deffile; |
236 char *resfile; | 236 char *resfile; |
237 char *exefile; | 237 char *exefile; |
238 | 238 char *mapfile; |
239 | |
240 #if IN_LLVM | |
239 // LDC stuff | 241 // LDC stuff |
240 OUTPUTFLAG output_ll; | 242 OUTPUTFLAG output_ll; |
241 OUTPUTFLAG output_bc; | 243 OUTPUTFLAG output_bc; |
242 OUTPUTFLAG output_s; | 244 OUTPUTFLAG output_s; |
243 OUTPUTFLAG output_o; | 245 OUTPUTFLAG output_o; |
248 | 250 |
249 // target stuff | 251 // target stuff |
250 const char* llvmArch; | 252 const char* llvmArch; |
251 const char *targetTriple; | 253 const char *targetTriple; |
252 const char *dataLayout; | 254 const char *dataLayout; |
255 #endif | |
253 }; | 256 }; |
254 | 257 |
255 struct Global | 258 struct Global |
256 { | 259 { |
257 const char *mars_ext; | 260 const char *mars_ext; |
266 const char *lib_ext; | 269 const char *lib_ext; |
267 const char *doc_ext; // for Ddoc generated files | 270 const char *doc_ext; // for Ddoc generated files |
268 const char *ddoc_ext; // for Ddoc macro include files | 271 const char *ddoc_ext; // for Ddoc macro include files |
269 const char *hdr_ext; // for D 'header' import files | 272 const char *hdr_ext; // for D 'header' import files |
270 const char *json_ext; // for JSON files | 273 const char *json_ext; // for JSON files |
274 const char *map_ext; // for .map files | |
271 const char *copyright; | 275 const char *copyright; |
272 const char *written; | 276 const char *written; |
273 Array *path; // Array of char*'s which form the import lookup path | 277 Array *path; // Array of char*'s which form the import lookup path |
274 Array *filePath; // Array of char*'s which form the file import lookup path | 278 Array *filePath; // Array of char*'s which form the file import lookup path |
275 int structalign; | 279 int structalign; |
391 LINKc, | 395 LINKc, |
392 LINKcpp, | 396 LINKcpp, |
393 LINKwindows, | 397 LINKwindows, |
394 LINKpascal, | 398 LINKpascal, |
395 | 399 |
396 // LDC | 400 #if IN_LLVM |
397 LINKintrinsic, | 401 LINKintrinsic, |
402 #endif | |
398 }; | 403 }; |
399 | 404 |
400 enum DYNCAST | 405 enum DYNCAST |
401 { | 406 { |
402 DYNCAST_OBJECT, | 407 DYNCAST_OBJECT, |