about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2020-12-25 11:31:33 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2020-12-25 11:31:33 +0100
commit20ffea6b8a9f614eed854adbba75626effc1f111 (patch)
treef90dcdaba67197dd1b84293dc2b4cad94a6d78d8 /scripts
parentc556e4dd354056ef3c4a9fbcd1ab67510e935833 (diff)
downloadrust-20ffea6b8a9f614eed854adbba75626effc1f111.tar.gz
rust-20ffea6b8a9f614eed854adbba75626effc1f111.zip
Change the way JIT mode is selected
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/cargo.sh2
-rwxr-xr-xscripts/filter_profile.rs2
-rwxr-xr-xscripts/tests.sh4
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/cargo.sh b/scripts/cargo.sh
index dcd40acc02a..934b2c6d7a1 100755
--- a/scripts/cargo.sh
+++ b/scripts/cargo.sh
@@ -10,7 +10,7 @@ cmd=$1
 shift || true
 
 if [[ "$cmd" = "jit" ]]; then
-cargo "+${TOOLCHAIN}" rustc "$@" -- --jit
+cargo "+${TOOLCHAIN}" rustc "$@" -- -Cllvm-args=mode=jit -Cprefer-dynamic
 else
 cargo "+${TOOLCHAIN}" "$cmd" "$@"
 fi
diff --git a/scripts/filter_profile.rs b/scripts/filter_profile.rs
index 3327c10089d..15388926ec9 100755
--- a/scripts/filter_profile.rs
+++ b/scripts/filter_profile.rs
@@ -4,7 +4,7 @@
 pushd $(dirname "$0")/../
 source build/config.sh
 popd
-PROFILE=$1 OUTPUT=$2 exec $RUSTC $RUSTFLAGS --jit $0
+PROFILE=$1 OUTPUT=$2 exec $RUSTC $RUSTFLAGS -Cllvm-args=mode=jit -Cprefer-dynamic $0
 #*/
 
 //! This program filters away uninteresting samples and trims uninteresting frames for stackcollapse
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 114b6f30a4a..60ed7aac8aa 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -15,7 +15,7 @@ function no_sysroot_tests() {
 
     if [[ "$JIT_SUPPORTED" = "1" ]]; then
         echo "[JIT] mini_core_hello_world"
-        CG_CLIF_JIT_ARGS="abc bcd" $MY_RUSTC --jit example/mini_core_hello_world.rs --cfg jit --target "$HOST_TRIPLE"
+        CG_CLIF_JIT_ARGS="abc bcd" $MY_RUSTC -Cllvm-args=mode=jit -Cprefer-dynamic example/mini_core_hello_world.rs --cfg jit --target "$HOST_TRIPLE"
     else
         echo "[JIT] mini_core_hello_world (skipped)"
     fi
@@ -37,7 +37,7 @@ function base_sysroot_tests() {
 
     if [[ "$JIT_SUPPORTED" = "1" ]]; then
         echo "[JIT] std_example"
-        $MY_RUSTC --jit example/std_example.rs --target "$HOST_TRIPLE"
+        $MY_RUSTC -Cllvm-args=mode=jit -Cprefer-dynamic example/std_example.rs --target "$HOST_TRIPLE"
     else
         echo "[JIT] std_example (skipped)"
     fi