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

Unified Diff: src/untrusted/stubs/crtn_x86_64.S

Issue 639113003: Add nacl-clang testing to SCons (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: ncbray comment Created 6 years, 2 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/untrusted/stubs/crtn_x86_32.S ('k') | tests/compiler_thread_suspension/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/untrusted/stubs/crtn_x86_64.S
diff --git a/src/untrusted/stubs/crtn_x86_64.S b/src/untrusted/stubs/crtn_x86_64.S
index bd3bd859d55b6be5bb86a35bef29aec28c4ba6be..d781b392bc9182838470ef04ec6da6e1cebe52fd 100644
--- a/src/untrusted/stubs/crtn_x86_64.S
+++ b/src/untrusted/stubs/crtn_x86_64.S
@@ -3,7 +3,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
+ /*
+ * nacl-clang does not use the .init/.fini mechanism at all.
+ */
+#if !defined(__clang__)
/*
* The .init section needs to be finished by a function return.
*/
@@ -29,5 +32,5 @@
movl %r11d,%ebp
addq %r15,%rbp
naclret
-
+#endif
.p2align NACLENTRYALIGN,0xf4
« no previous file with comments | « src/untrusted/stubs/crtn_x86_32.S ('k') | tests/compiler_thread_suspension/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698