Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

Unified Diff: src/trusted/cpu_features/arch/x86/cpu_xgetbv.S

Issue 11864002: Move CPU features into its own static library. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Another go at Windows x64, with help from Noel. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/trusted/cpu_features/arch/x86/cpu_x86_test.c ('k') | src/trusted/cpu_features/build.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « src/trusted/cpu_features/arch/x86/cpu_x86_test.c ('k') | src/trusted/cpu_features/build.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698