summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-26 20:14:16 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-26 20:14:16 +0000
commita6235027b34d8afbcb48eeed945ad7b4e8fed1a0 (patch)
tree2cbfedf0c2b925a43bb741afd2228671c31fc12b
parentfbc632fec59139ac75cb3d171c65d65057512b99 (diff)
downloadruby-a6235027b34d8afbcb48eeed945ad7b4e8fed1a0.tar.gz
ruby-a6235027b34d8afbcb48eeed945ad7b4e8fed1a0.tar.xz
ruby-a6235027b34d8afbcb48eeed945ad7b4e8fed1a0.zip
* vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it.
LLVM/clang defines __GNUC__ but doesn't have __asm__.. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_exec.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e28863fba..31d7bb3ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 27 05:11:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it.
+ LLVM/clang defines __GNUC__ but doesn't have __asm__..
+
Tue Oct 27 03:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (config.h): added RUBY_SITEARCH to use
diff --git a/vm_exec.c b/vm_exec.c
index 51b8a0f14..a2c354172 100644
--- a/vm_exec.c
+++ b/vm_exec.c
@@ -14,10 +14,10 @@
#if VMDEBUG > 0
#define DECL_SC_REG(type, r, reg) register type reg_##r
-#elif __GNUC__ && __x86_64__
+#elif __GNUC__ && __x86_64__ && defined(__asm__)
#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
-#elif __GNUC__ && __i386__
+#elif __GNUC__ && __i386__ && defined(__asm__)
#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("e" reg)
#else