Merge pull request #1012 from ncos/x86-64_2_x86_64

Add x86_64 to be alias of x86-64

alloy.py

@@ -808,11 +808,11 @@ def Main():
         if os.environ.get("SMTP_ISPC") == None:
             error("you have no SMTP_ISPC in your environment for option notify", 1)
     if options.only != "":
-        test_only_r = " 3.2 3.3 3.4 3.5 3.6 trunk current build stability performance x86 x86-64 -O0 -O2 native debug nodebug "
+        test_only_r = " 3.2 3.3 3.4 3.5 3.6 trunk current build stability performance x86 x86-64 x86_64 -O0 -O2 native debug nodebug "
         test_only = options.only.split(" ")
         for iterator in test_only:
             if not (" " + iterator + " " in test_only_r):
-                error("unknow option for only: " + iterator, 1)
+                error("unknown option for only: " + iterator, 1)
     if current_OS == "Windows":
         if options.debug == True or options.selfbuild == True or options.tarball != "":
             error("Debug, selfbuild and tarball options are unsupported on windows", 1)

ispc.cpp

@@ -496,6 +496,10 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
             arch = "x86-64";
     }
 
+    // Define arch alias
+    if (std::string(arch) == "x86_64")
+        arch = "x86-64";
+
     bool error = false;
 
     // Make sure the target architecture is a known one; print an error

module.cpp

@@ -2869,7 +2869,7 @@ lCreateDispatchFunction(llvm::Module *module, llvm::Function *setISAFunc,
     // ISA and sets __system_best_isa, if it hasn't been set yet.
     llvm::CallInst::Create(setISAFunc, "", bblock);
 
-    // Now we can load the system's ISA enuemrant
+    // Now we can load the system's ISA enumerant
     llvm::Value *systemISA =
         new llvm::LoadInst(systemBestISAPtr, "system_isa", bblock);