[前][次][番号順一覧][スレッド一覧]

ruby-changes:28584

From: akr <ko1@a...>
Date: Sat, 11 May 2013 00:50:08 +0900 (JST)
Subject: [ruby-changes:28584] akr:r40636 (trunk): * gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining

akr	2013-05-11 00:49:56 +0900 (Sat, 11 May 2013)

  New Revision: 40636

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

  Log:
    * gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining
      condition to avoid compilation error on x32.
      https://sites.google.com/site/x32abi/

  Modified files:
    trunk/ChangeLog
    trunk/gc.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40635)
+++ ChangeLog	(revision 40636)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat May 11 00:47:22 2013  Tanaka Akira  <akr@f...>
+
+	* gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining
+	  condition to avoid compilation error on x32.
+	  https://sites.google.com/site/x32abi/
+
 Fri May 10 23:56:34 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_peek_variable_name): treat invalid global, class,
Index: gc.h
===================================================================
--- gc.h	(revision 40635)
+++ gc.h	(revision 40636)
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/gc.h#L2
 #ifndef RUBY_GC_H
 #define RUBY_GC_H 1
 
-#if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__)
+#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
 #elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))

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

[前][次][番号順一覧][スレッド一覧]