Merge branch 'master' into no_std

lib/native/Cargo.toml

@@ -1,26 +1,23 @@
 [package]
 name = "cretonne-native"
-version = "0.4.1"
+version = "0.5.0"
 authors = ["The Cretonne Project Developers"]
 description = "Support for targeting the host with Cretonne"
-repository = "https://github.com/Cretonne/cretonne"
+repository = "https://github.com/cretonne/cretonne"
 license = "Apache-2.0"
 readme = "README.md"
 
-[lib]
-name = "cton_native"
-
 [dependencies]
-cretonne = { path = "../cretonne", version = "0.4.1", default-features = false }
+cretonne-codegen = { path = "../codegen", version = "0.5.0", default-features = false }
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
 raw-cpuid = "3.0.0"
 
 [features]
 default = ["std"]
-std = ["cretonne/std"]
-core = ["cretonne/core"]
+std = ["cretonne-codegen/std"]
+core = ["cretonne-codegen/core"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "Cretonne/cretonne" }
+travis-ci = { repository = "cretonne/cretonne" }

lib/native/src/lib.rs

@@ -2,16 +2,14 @@
 //! Cretonne to generate code to run on the same machine.
 
 #![deny(missing_docs, trivial_numeric_casts, unused_extern_crates)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
-extern crate cretonne;
-
+extern crate cretonne_codegen;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 extern crate raw_cpuid;
 
-use cretonne::isa;
-use cretonne::settings::{self, Configurable};
+use cretonne_codegen::isa;
+use cretonne_codegen::settings::{self, Configurable};
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use raw_cpuid::CpuId;
@@ -29,7 +27,7 @@ pub fn builders() -> Result<(settings::Builder, isa::Builder), &'static str> {
     }
 
     let name = if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
-        "intel"
+        "x86"
     } else if cfg!(target_arch = "arm") {
         "arm32"
     } else if cfg!(target_arch = "aarch64") {