comparison dmd/mars.c @ 583:12bda38ea366

Fixed choosing default target machine without needing to link in targets.
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sun, 07 Sep 2008 17:44:25 -0700
parents 7824c21a58e3
children 29dc68c949b0
comparison
equal deleted inserted replaced
582:723806dc48d8 583:12bda38ea366
38 38
39 #include "gen/logger.h" 39 #include "gen/logger.h"
40 #include "gen/linker.h" 40 #include "gen/linker.h"
41 41
42 void getenv_setargv(const char *envvar, int *pargc, char** *pargv); 42 void getenv_setargv(const char *envvar, int *pargc, char** *pargv);
43
44 // llvmdc
45 void findDefaultTarget();
46 43
47 Global global; 44 Global global;
48 45
49 Global::Global() 46 Global::Global()
50 { 47 {
751 } 748 }
752 749
753 bool allowForceEndianness = false; 750 bool allowForceEndianness = false;
754 751
755 if (global.params.llvmArch == 0) { 752 if (global.params.llvmArch == 0) {
756 findDefaultTarget(); 753 #if defined(__x86_64__) || defined(_M_X64)
754 global.params.llvmArch = "x86-64";
755 #elif defined(__i386__) || defined(_M_IX86)
756 global.params.llvmArch = "x86";
757 #elif defined(__ppc__) || defined(_M_PPC)
758 if (global.params.is64bit)
759 global.params.llvmArch = "ppc64";
760 else
761 global.params.llvmArch = "ppc32";
762 #else
763 #error
764 #endif
757 } 765 }
758 766
759 if (strcmp(global.params.llvmArch,"x86")==0) { 767 if (strcmp(global.params.llvmArch,"x86")==0) {
760 VersionCondition::addPredefinedGlobalIdent("X86"); 768 VersionCondition::addPredefinedGlobalIdent("X86");
761 global.params.isLE = true; 769 global.params.isLE = true;