cpuid-bool: fix SGX support (#67)

RustCrypto · Jul 14, 2020 · 93d93bd · 93d93bd
1 parent 9b269d5
commit 93d93bd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cpuid-bool/CHANGELOG.md b/cpuid-bool/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.1.0 (2020-07-14)
+### Fixed
+- SGX target support ([#67])
+
+[#67]: https://github.com/RustCrypto/utils/pull/67
+
+## 0.1.0 (2020-06-11)
+- Initial release
diff --git a/cpuid-bool/Cargo.toml b/cpuid-bool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cpuid-bool"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "A lightweight no-std compatible alternative to is_x86_feature_detected"

diff --git a/cpuid-bool/src/lib.rs b/cpuid-bool/src/lib.rs
@@ -92,7 +92,8 @@ expand_check_macro! {
 #[macro_export]
 macro_rules! cpuid_bool {
     ($($tf:tt),+ $(,)? ) => {{
-        #[cfg(not(all($(target_feature=$tf, )*)))]
+        // CPUID is not available on SGX targets
+        #[cfg(not(all(not(target_env = "sgx"), $(target_feature=$tf, )*)))]
         let res = {
             #[cfg(target_arch = "x86")]
             use core::arch::x86::{__cpuid, __cpuid_count};