Index: src/trusted/cpu_features/arch/x86/cpu_xgetbv.S |
diff --git a/src/trusted/validator/x86/nacl_xgetbv.S b/src/trusted/cpu_features/arch/x86/cpu_xgetbv.S |
similarity index 94% |
rename from src/trusted/validator/x86/nacl_xgetbv.S |
rename to src/trusted/cpu_features/arch/x86/cpu_xgetbv.S |
index 4c861fcb4ffafbc896e1c0b28397cb7e9fd9a0c1..39207eafd8cebce118ed8c159976d75fef97fa6f 100644 |
--- a/src/trusted/validator/x86/nacl_xgetbv.S |
+++ b/src/trusted/cpu_features/arch/x86/cpu_xgetbv.S |
@@ -15,6 +15,7 @@ |
.text |
DEFINE_GLOBAL_HIDDEN_IDENTIFIER(NaClXGETBV): |
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 |
#if NACL_BUILD_SUBARCH == 32 |
movl 4(%esp), %ecx |
#elif !NACL_WINDOWS |
@@ -29,3 +30,4 @@ DEFINE_GLOBAL_HIDDEN_IDENTIFIER(NaClXGETBV): |
orq %rdx, %rax |
#endif |
ret |
+#endif |
bsy
2013/01/11 21:11:30
isn't this a tad dangerous -- if this is not NACL_
Roland McGrath
2013/01/11 21:15:00
In other cases we just put #error in an #else clau
bsy
2013/01/11 21:19:53
the problem is that this is getting built for all
|