Merged with upstream/master

2013-11-22 08:13:16 +01:00
parent 6f200d310f 0f7ac1cc90
commit bb46b561fd
33 changed files with 795 additions and 394 deletions
--- a/module.cpp
+++ b/module.cpp
@@ -2601,7 +2601,7 @@ Module::CompileAndOutput(const char *srcFile,
        int i = 0;
        const char *firstISA;
        while (i < Target::NUM_ISAS && firstTargetMachine == NULL) {
-            firstISA = Target::ISAToString((Target::ISA) i);
+            firstISA = Target::ISAToTargetString((Target::ISA) i);
            firstTargetMachine = targetMachines[i++];
        }
        Assert(firstTargetMachine != NULL);