* 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/



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-05-10 15:49:56 +00:00
parent ecddb96785
commit b1dd4c92ce
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,9 @@
Sat May 11 00:47:22 2013 Tanaka Akira <akr@fsij.org>
* 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@ruby-lang.org>
* parse.y (parser_peek_variable_name): treat invalid global, class,

2
gc.h
View File

@ -2,7 +2,7 @@
#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)))