Support TLS with Mach-O too

Author: bjorn3

Cargo.lock

@@ -42,8 +42,9 @@ cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
 cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
 cranelift-object = { path = "../cranelift/cranelift-object" }
 
-#[patch.crates-io]
+[patch.crates-io]
 #gimli = { path = "../" }
+object = { path = "./object" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cranelift-simplejit = { git = "https://github.com/CraneStation/cranelift.git" }

Cargo.toml

@@ -9,7 +9,6 @@ git clone https://github.com/rust-lang/regex.git || echo "rust-lang/regex has al
 pushd regex
 git checkout -- .
 git checkout 341f207c1071f7290e3f228c710817c280c8dca1
-git apply ../crate_patches/regex.patch
 popd
 
 git clone https://github.com/ebobby/simple-raytracer || echo "ebobby/simple-raytracer has already been cloned"

crate_patches/regex.patch

@@ -250,6 +250,10 @@ fn default_call_conv(sess: &Session) -> CallConv {
 }
 
 fn build_isa(sess: &Session, enable_pic: bool) -> Box<dyn isa::TargetIsa + 'static> {
+    use target_lexicon::BinaryFormat;
+
+    let target_triple = crate::target_triple(sess);
+
     let mut flags_builder = settings::builder();
     if enable_pic {
         flags_builder.enable("is_pic").unwrap();
@@ -268,6 +272,14 @@ fn build_isa(sess: &Session, enable_pic: bool) -> Box<dyn isa::TargetIsa + 'stat
         )
         .unwrap();
 
+    let tls_model = match target_triple.binary_format {
+        BinaryFormat::Elf => "tls_gd",
+        BinaryFormat::Macho => "macho",
+        BinaryFormat::Coff => "coff",
+        _ => "none",
+    };
+    flags_builder.set("tls_model", tls_model).unwrap();
+
     // FIXME(CraneStation/cranelift#732) fix LICM in presence of jump tables
     /*
     use rustc::session::config::OptLevel;
@@ -284,7 +296,6 @@ fn build_isa(sess: &Session, enable_pic: bool) -> Box<dyn isa::TargetIsa + 'stat
         }
     }*/
 
-    let target_triple = crate::target_triple(sess);
     let flags = settings::Flags::new(flags_builder);
     cranelift::codegen::isa::lookup(target_triple)
         .unwrap()

prepare.sh

@@ -7,7 +7,7 @@ if [[ "$1" == "--release" ]]; then
     cargo build --release $CG_CLIF_COMPILE_FLAGS
 else
     export CHANNEL='debug'
-    cargo rustc $CG_CLIF_COMPILE_FLAGS --features backend_object -- -Clink-args=-fuse-ld=lld
+    cargo build $CG_CLIF_COMPILE_FLAGS --features backend_object
 fi
 
 source config.sh
@@ -78,7 +78,7 @@ echo "[TEST] rust-lang/regex example shootout-regex-dna"
 ../cargo.sh clean
 # Make sure `[codegen mono items] start` doesn't poison the diff
 ../cargo.sh build --example shootout-regex-dna
-cat examples/regexdna-input.txt | ../cargo.sh run --example shootout-regex-dna > res.txt
+cat examples/regexdna-input.txt | ../cargo.sh run --example shootout-regex-dna | grep -v "Threads are not yet" > res.txt
 diff -u res.txt examples/regexdna-output.txt
 
 echo "[TEST] rust-lang/regex tests"