Merge pull request #261 from volcano0dr/master

dingelish · web-flow · commit 3fff5077aeb2 · 2020-08-03T11:25:32.000-07:00
Fix no-landing-pads error
diff --git a/samplecode/sgx-cov/enclave/Makefile b/samplecode/sgx-cov/enclave/Makefile
@@ -29,7 +29,7 @@ ifneq ($(COV),) # Debug build + coverage collection
 	COV_FLAGS = CARGO_INCREMENTAL=0 \
 	    RUSTFLAGS="-D warnings -Zprofile -Ccodegen-units=1 \
 	    -Cllvm_args=-inline-threshold=0 -Clink-dead-code \
-	    -Coverflow-checks=off -Zno-landing-pads"
+	    -Coverflow-checks=off -Cpanic=abort"
 
 	WRAPPER = "./enclave-cov-rustc"
 endif
diff --git a/samplecode/sgx-cov/enclave/enclave-cov-rustc b/samplecode/sgx-cov/enclave/enclave-cov-rustc
@@ -2,7 +2,7 @@
 
 COV_RUSTFLAGS="-Zprofile -Ccodegen-units=1 \
         -Cllvm_args=-inline-threshold=0 -Clink-dead-code \
-        -Coverflow-checks=off -Zno-landing-pads"
+        -Coverflow-checks=off -Cpanic=abort"
 
 get_crate_name()
 {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`COV_RUSTFLAGS="-Zprofile -Ccodegen-units=1 \`
`4`	`4`	`-Cllvm_args=-inline-threshold=0 -Clink-dead-code \`
`5`		`- -Coverflow-checks=off -Zno-landing-pads"`
	`5`	`+ -Coverflow-checks=off -Cpanic=abort"`
`6`	`6`
`7`	`7`	`get_crate_name()`
`8`	`8`	`{`