naruse	2011-04-24 02:34:58 +0900 (Sun, 24 Apr 2011)

  New Revision: 31327

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31327

  Log:
    * include/ruby/intern.h: pcc can't use __builtin_constant_p.
    
    * vm_exec.c: change condition.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/intern.h
    trunk/vm_exec.c

Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 31326)
+++ include/ruby/intern.h	(revision 31327)
@@ -715,7 +715,7 @@
 long rb_str_offset(VALUE, long);
 size_t rb_str_capacity(VALUE);
 VALUE rb_str_ellipsize(VALUE, long);
-#if defined __GNUC__
+#if defined(__GNUC__) && !defined(__PCC__)
 #define rb_str_new_cstr(str) __extension__ (	\
 {						\
     (__builtin_constant_p(str)) ?		\
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31326)
+++ ChangeLog	(revision 31327)
@@ -1,3 +1,9 @@
+Sun Apr 24 02:25:23 2011  NARUSE, Yui  <naruse@r...>
+
+	* include/ruby/intern.h: pcc can't use __builtin_constant_p.
+
+	* vm_exec.c: change condition.
+
 Sun Apr 24 01:58:01 2011  NARUSE, Yui  <naruse@r...>
 
 	* ext/date/date_core.c (leap_p): surpress warning: parentheses.
Index: vm_exec.c
===================================================================
--- vm_exec.c	(revision 31326)
+++ vm_exec.c	(revision 31327)
@@ -11,13 +11,13 @@
 
 #include <math.h>
 
-#if VMDEBUG > 0
+#if (VMDEBUG > 0) || defined(__clang)
 #define DECL_SC_REG(type, r, reg) register type reg_##r
 
-#elif __GNUC__ && __x86_64__ && !__clang__
+#elif __GNUC__ && __x86_64__
 #define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
 
-#elif __GNUC__ && __i386__ && !__clang__
+#elif __GNUC__ && __i386__
 #define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("e" reg)
 
 #else

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/