From b1dd4c92ce95bc0deaf7ab34524f239953434ecb Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 10 May 2013 15:49:56 +0000 Subject: [PATCH] * 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 --- ChangeLog | 6 ++++++ gc.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3150e259ff..db5c0dbf33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat May 11 00:47:22 2013 Tanaka Akira + + * 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 * parse.y (parser_peek_variable_name): treat invalid global, class, diff --git a/gc.h b/gc.h index 9312f9cff7..727e310215 100644 --- a/gc.h +++ b/gc.h @@ -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)))