From b5293067fcb206dc8f497ebce5eb01593b7fd154 Mon Sep 17 00:00:00 2001 From: Anton Mitrokhin Date: Thu, 16 Apr 2015 14:42:34 +0300 Subject: [PATCH 1/2] add x86_64 to be alias of x86-64 --- ispc.cpp | 4 ++++ module.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ispc.cpp b/ispc.cpp index 6fe3579e..4aad71fa 100644 --- a/ispc.cpp +++ b/ispc.cpp @@ -495,6 +495,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 diff --git a/module.cpp b/module.cpp index 9ad007a3..3042c3c0 100644 --- a/module.cpp +++ b/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); From e754cb99c77debb10bc4113c7908086bd1811a61 Mon Sep 17 00:00:00 2001 From: Anton Mitrokhin Date: Thu, 16 Apr 2015 14:56:40 +0300 Subject: [PATCH 2/2] allow x86_64 in alloy.py (run_tests has no problems with it) --- alloy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alloy.py b/alloy.py index ffcb5743..e896ec2e 100755 --- a/alloy.py +++ b/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)