fix clippy run support

Signed-off-by: Jun Kimura <junkxdev@gmail.com>

Author: bluele

Makefile

@@ -15,10 +15,8 @@ fmt-check:
 .PHONY: clippy
 clippy:
 	@find . -name Cargo.toml -not -path "./target/*" -exec dirname {} \; | while read dir; do \
-		if echo "$$dir" | grep -E -q "(enclave$$|sgx-ert|sgx-trts|sgx-tcrypto|sgx-tse|sgx-tseal)"; then \
-			echo "Running clippy on $$dir with SGX target..."; \
-			TARGET_SPEC="$$(pwd)/unit-test/enclave/x86_64-unknown-unknown-sgx.json"; \
-			(cd "$$dir" && cargo clippy -Z build-std=core,alloc --target="$$TARGET_SPEC" --all-features -- -D warnings) || exit 1; \
+		if echo "$$dir" | grep -E -q "(enclave$$)"; then \
+			echo "Skipping $$dir"; \
 		else \
 			echo "Running clippy on $$dir..."; \
 			(cd "$$dir" && cargo clippy --all-targets --all-features -- -D warnings) || exit 1; \

sgx-ert/src/lib.rs

@@ -22,13 +22,14 @@ pub use sgx_types;
 #[global_allocator]
 static ALLOC: sgx_alloc::System = sgx_alloc::System;
 
-#[cfg(feature = "panic-handler")]
+#[cfg(all(feature = "panic-handler", target_env = "sgx"))]
 #[allow(unused_variables)]
 #[panic_handler]
 fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
     sgx_abort();
 }
 
+#[cfg(target_env = "sgx")]
 #[lang = "eh_personality"]
 fn rust_eh_personality() {}
 
@@ -65,6 +66,7 @@ pub fn take_alloc_error_hook() -> fn(Layout) {
 
 fn default_alloc_error_hook(_layout: Layout) {}
 
+#[cfg(target_env = "sgx")]
 #[alloc_error_handler]
 pub fn rust_oom(layout: Layout) -> ! {
     let hook = HOOK.load(Ordering::SeqCst);
@@ -77,6 +79,7 @@ pub fn rust_oom(layout: Layout) -> ! {
     sgx_abort();
 }
 
+#[cfg(target_env = "sgx")]
 fn sgx_abort() -> ! {
     unsafe { sgx_types::abort() }
 }

sgx-types/src/function.rs

@@ -22,8 +22,8 @@ use crate::*;
 // Constants from sgx-trts
 pub const LAYOUT_ENTRY_NUM: usize = 43;
 
-#[cfg(all(feature = "tstdc", target_env = "sgx"))]
-#[link(name = "sgx_tstdc", kind = "static")]
+#[cfg(feature = "tstdc")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_tstdc", kind = "static"))]
 extern "C" {
     //
     // sgx_cpuid.h
@@ -107,13 +107,13 @@ extern "C" {
     pub fn sgx_alloc_rsrv_mem_ex(desired_addr: *const c_void, length: size_t) -> *mut c_void;
 }
 
-#[cfg(all(feature = "tservice", target_env = "sgx"))]
+#[cfg(feature = "tservice")]
 #[cfg_attr(
-    not(feature = "simulation"),
+    all(target_env = "sgx", not(feature = "simulation")),
     link(name = "sgx_tservice", kind = "static")
 )]
 #[cfg_attr(
-    feature = "simulation",
+    all(target_env = "sgx", feature = "simulation"),
     link(name = "sgx_tservice_sim", kind = "static")
 )]
 extern "C" {
@@ -278,8 +278,8 @@ extern "C" {
     ) -> *mut c_void;
 }
 
-#[cfg(all(feature = "tcrypto", target_env = "sgx"))]
-#[link(name = "sgx_tcrypto", kind = "static")]
+#[cfg(feature = "tcrypto")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_tcrypto", kind = "static"))]
 extern "C" {
     //
     // sgx_tcrypto.h
@@ -619,8 +619,8 @@ extern "C" {
     ) -> sgx_status_t;
 }
 
-#[cfg(all(feature = "tkey_exchange", target_env = "sgx"))]
-#[link(name = "sgx_tkey_exchange", kind = "static")]
+#[cfg(feature = "tkey_exchange")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_tkey_exchange", kind = "static"))]
 extern "C" {
     //
     // sgx_tkey_exchange.h
@@ -650,9 +650,15 @@ extern "C" {
     ) -> sgx_status_t;
 }
 
-#[cfg(all(feature = "trts", target_env = "sgx"))]
-#[cfg_attr(not(feature = "simulation"), link(name = "sgx_trts", kind = "static"))]
-#[cfg_attr(feature = "simulation", link(name = "sgx_trts_sim", kind = "static"))]
+#[cfg(feature = "trts")]
+#[cfg_attr(
+    all(target_env = "sgx", not(feature = "simulation")),
+    link(name = "sgx_trts", kind = "static")
+)]
+#[cfg_attr(
+    all(target_env = "sgx", feature = "simulation"),
+    link(name = "sgx_trts_sim", kind = "static")
+)]
 extern "C" {
 
     pub fn abort() -> !;
@@ -787,8 +793,8 @@ pub struct thread_data_t {
 }
 
 /* intel sgx sdk 2.18 */
-#[cfg(all(feature = "mm", target_env = "sgx"))]
-#[link(name = "sgx_mm", kind = "static")]
+#[cfg(feature = "mm")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_mm", kind = "static"))]
 extern "C" {
     pub fn sgx_mm_alloc(
         addr: *const c_void,
@@ -1055,8 +1061,8 @@ extern "C" {
 }
 
 /* intel sgx sdk 1.9 */
-#[cfg(all(feature = "tprotected_fs", target_env = "sgx"))]
-#[link(name = "sgx_tprotected_fs", kind = "static")]
+#[cfg(feature = "tprotected_fs")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_tprotected_fs", kind = "static"))]
 extern "C" {
     //
     // sgx_tprotected_fs.h
@@ -1423,8 +1429,8 @@ extern "C" {
 }
 
 /* intel DCAP 1.7 */
-#[cfg(all(feature = "dcap_tvl", target_env = "sgx"))]
-#[link(name = "sgx_dcap_tvl", kind = "static")]
+#[cfg(feature = "dcap_tvl")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_dcap_tvl", kind = "static"))]
 extern "C" {
     //
     // sgx_dcap_tvl.h
@@ -1443,8 +1449,8 @@ extern "C" {
 }
 
 /* intel DCAP 1.15 */
-#[cfg(all(feature = "tdx_attest", target_env = "sgx"))]
-#[link(name = "libtdx_attest", kind = "dylib")]
+#[cfg(feature = "tdx_attest")]
+#[cfg_attr(target_env = "sgx", link(name = "libtdx_attest", kind = "dylib"))]
 extern "C" {
     //
     // tdx_attes.h
@@ -1475,8 +1481,8 @@ extern "C" {
 }
 
 /* intel sgx sdk 2.16 */
-#[cfg(all(feature = "ttls", target_env = "sgx"))]
-#[link(name = "sgx_ttls", kind = "static")]
+#[cfg(feature = "ttls")]
+#[cfg_attr(target_env = "sgx", link(name = "sgx_ttls", kind = "static"))]
 extern "C" {
     //
     // sgx_ttls.h