nagachika	2014-08-11 22:43:40 +0900 (Mon, 11 Aug 2014)

  New Revision: 47139

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

  Log:
    merge revision(s) r46382,r46384,r46913: [Backport #9914]
    
    * io.c (rb_io_advise): AIX currently does not support a 32-bit call to
      posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira.
      [ruby-core:62968] [Bug #9914]
    
    * configure.in (posix_fadvise): disable use of posix_fadvise
      itself on 32-bit AIX.  [ruby-core:62968] [Bug #9914]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 47138)
+++ ruby_2_1/configure.in	(revision 47139)
@@ -1155,7 +1155,18 @@ mv confdefs.h largefile.h https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L1155
 mv confdefs1.h confdefs.h
 cat largefile.h >> confdefs.h
 
-AS_CASE(["$target_os"],[mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8])
+AS_CASE(["$target_os"],
+    [mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8],
+    [aix*], [
+    AS_CASE(["$target_cpu:$ac_cv_sys_large_files"],
+	[ppc64:*|powerpc64:*], [],
+	[*:no|*:unknown], [],
+	[
+	    # AIX currently does not support a 32-bit call to posix_fadvise()
+	    # if _LARGE_FILES is defined.
+	    ac_cv_posix_fadvise=no
+	])
+    ])
 
 AC_C_BIGENDIAN
 AC_C_CONST
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47138)
+++ ruby_2_1/ChangeLog	(revision 47139)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Aug 11 22:34:47 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (posix_fadvise): disable use of posix_fadvise
+	  itself on 32-bit AIX.  [ruby-core:62968] [Bug #9914]
+
+Mon Aug 11 22:34:47 2014    <kanemoto@r...>
+
+	* io.c (rb_io_advise): AIX currently does not support a 32-bit call to
+	  posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira.
+	  [ruby-core:62968] [Bug #9914]
+
 Mon Aug 11 22:14:28 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_insnhelper.c (vm_callee_setup_keyword_arg): adjust VM stack
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47138)
+++ ruby_2_1/version.h	(revision 47139)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-08-11"
-#define RUBY_PATCHLEVEL 197
+#define RUBY_PATCHLEVEL 198
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46382,46384,46913


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