Merge branch 'master' into nvptx

2014-07-08 15:11:45 +02:00
parent fe150c539f 1459207d87
commit 6fdf1a8f99
4 changed files with 48 additions and 10 deletions
--- a/ispc.cpp
+++ b/ispc.cpp
@@ -277,7 +277,7 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
        this->m_arch = arch;
    }

-    const char * cpuFromIsa;
+    const char * cpuFromIsa = "";

    // Check default LLVM generated targets
    if (!strcasecmp(isa, "sse2") ||