1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* addr2line.c: drop to support ATARI ST platform. It was discontinued

Browse Source 
more than two decades ago. [fix GH-1350] Patch by @cremno
* include/ruby/ruby.h: ditto.
* io.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2016-05-28 01:46:27 +00:00
parent 288878041f
commit 2bd2001d16
4 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat May 28 10:45:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* addr2line.c: drop to support ATARI ST platform. It was discontinued
more than two decades ago. [fix GH-1350] Patch by @cremno
* include/ruby/ruby.h: ditto.
* io.c: ditto.
Sat May 28 10:39:47 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Sat May 28 10:39:47 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* test/ruby/enc/test_case_comprehensive.rb: Converted exception for * test/ruby/enc/test_case_comprehensive.rb: Converted exception for

8
addr2line.c
View File

@ -36,11 +36,9 @@
/* Make alloca work the best possible way. */ /* Make alloca work the best possible way. */
#ifdef __GNUC__ #ifdef __GNUC__
# ifndef atarist # ifndef alloca
# ifndef alloca # define alloca __builtin_alloca
# define alloca __builtin_alloca # endif
# endif
# endif /* atarist */
#else #else
# ifdef HAVE_ALLOCA_H # ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>

8
include/ruby/ruby.h
View File

@ -58,11 +58,9 @@ RUBY_SYMBOL_EXPORT_BEGIN
/* Make alloca work the best possible way. */ /* Make alloca work the best possible way. */
#ifdef __GNUC__ #ifdef __GNUC__
# ifndef atarist # ifndef alloca
# ifndef alloca # define alloca __builtin_alloca
# define alloca __builtin_alloca # endif
# endif
# endif /* atarist */
#else #else
# ifdef HAVE_ALLOCA_H # ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>

32
io.c
View File

@ -9297,7 +9297,7 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
* +String+ objects or +Integer+ objects. A +String+ object is passed * +String+ objects or +Integer+ objects. A +String+ object is passed
* as a pointer to the byte sequence. An +Integer+ object is passed * as a pointer to the byte sequence. An +Integer+ object is passed
* as an integer whose bit size is same as a pointer. * as an integer whose bit size is same as a pointer.
* Up to nine parameters may be passed (14 on the Atari-ST). * Up to nine parameters may be passed.
* *
* The function identified by _num_ is system * The function identified by _num_ is system
* dependent. On some Unix systems, the numbers may be obtained from a * dependent. On some Unix systems, the numbers may be obtained from a
@ -9321,11 +9321,7 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
static VALUE static VALUE
rb_f_syscall(int argc, VALUE *argv) rb_f_syscall(int argc, VALUE *argv)
{ {
#ifdef atarist
VALUE arg[13]; /* yes, we really need that many ! */
#else
VALUE arg[8]; VALUE arg[8];
#endif
#if SIZEOF_VOIDP == 8 && defined(HAVE___SYSCALL) && SIZEOF_INT != 8 /* mainly *BSD */ #if SIZEOF_VOIDP == 8 && defined(HAVE___SYSCALL) && SIZEOF_INT != 8 /* mainly *BSD */
# define SYSCALL __syscall # define SYSCALL __syscall
# define NUM2SYSCALLID(x) NUM2LONG(x) # define NUM2SYSCALLID(x) NUM2LONG(x)
@ -9404,32 +9400,6 @@ rb_f_syscall(int argc, VALUE *argv)
case 8: case 8:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]); retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]);
break; break;
#ifdef atarist
case 9:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
arg[7]);
break;
case 10:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
arg[7], arg[8]);
break;
case 11:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
arg[7], arg[8], arg[9]);
break;
case 12:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
arg[7], arg[8], arg[9], arg[10]);
break;
case 13:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
arg[7], arg[8], arg[9], arg[10], arg[11]);
break;
case 14:
retval = SYSCALL(num, arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
arg[7], arg[8], arg[9], arg[10], arg[11], arg[12]);
break;
#endif
} }
if (retval == -1) if (retval == -1)