Skip to content

Commit

Permalink
* vm_exec.c: remove conditions for clang
Browse files Browse the repository at this point in the history
  because clang version 3.0 (trunk 132165) doesn't need them.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nurse committed May 31, 2011
1 parent b4bc823 commit 70c97ec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Tue May 31 10:49:55 2011 NARUSE, Yui <naruse@ruby-lang.org>

* vm_exec.c: remove conditions for clang
because clang version 3.0 (trunk 132165) doesn't need them.

Mon May 30 22:19:33 2011 Tanaka Akira <akr@fsij.org>

* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): don't
Expand Down
8 changes: 4 additions & 4 deletions vm_exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <math.h>

#if (VMDEBUG > 0) || defined(__clang)
#if VMDEBUG > 0
#define DECL_SC_REG(type, r, reg) register type reg_##r

#elif __GNUC__ && __x86_64__
Expand Down Expand Up @@ -40,7 +40,7 @@ vm_exec_core(rb_thread_t *th, VALUE initial)

#if OPT_STACK_CACHING
#if 0
#elif __GNUC__ && __x86_64 && !__clang__
#elif __GNUC__ && __x86_64__
DECL_SC_REG(VALUE, a, "12");
DECL_SC_REG(VALUE, b, "13");
#else
Expand All @@ -49,12 +49,12 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
#endif
#endif

#if __GNUC__ && __i386__ && !__clang__
#if __GNUC__ && __i386__
DECL_SC_REG(VALUE *, pc, "di");
DECL_SC_REG(rb_control_frame_t *, cfp, "si");
#define USE_MACHINE_REGS 1

#elif __GNUC__ && __x86_64__ && !__clang__
#elif __GNUC__ && __x86_64__
DECL_SC_REG(VALUE *, pc, "14");
DECL_SC_REG(rb_control_frame_t *, cfp, "15");
#define USE_MACHINE_REGS 1
Expand Down

0 comments on commit 70c97ec

Please sign in to comment.