nagachika	2014-09-06 00:55:12 +0900 (Sat, 06 Sep 2014)

  New Revision: 47418

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

  Log:
    merge revision(s) r46796: [Backport #10008]
    
    * configure.in (rb_cv_broken_backtrace): exit with failure
      normally, no needs to abort.  [ruby-core:63678] [Bug #10008]

  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 47417)
+++ ruby_2_1/configure.in	(revision 47418)
@@ -2886,24 +2886,25 @@ void sigsegv(int signum, siginfo_t *info https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2886
     if (n > 0) {
 	/*fprintf(stdout, "backtrace:%d\n",n);*/
     } else {
-	abort();
+	_exit(EXIT_FAILURE);
     }
-    _exit(0);
+    _exit(EXIT_SUCCESS);
 }
 int
-main()
+main(void)
 {
+    volatile int *a = NULL;
     stack_t ss;
     ss.ss_sp = malloc(SIGSTKSZ);
     if (ss.ss_sp == NULL) {
 	fprintf(stderr, "cannot allocate memory for sigaltstack\n");
-	abort();
+	return EXIT_FAILURE;
     }
     ss.ss_size = SIGSTKSZ;
     ss.ss_flags = 0;
     if (sigaltstack(&ss, NULL) == -1) {
 	fprintf(stderr, "sigaltstack failed\n");
-	abort();
+	return EXIT_FAILURE;
     }
     struct sigaction sa;
     memset(&sa, 0, sizeof(struct sigaction));
@@ -2912,9 +2913,8 @@ main() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2913
     sa.sa_flags |= SA_SIGINFO;
     sa.sa_flags |= SA_ONSTACK;
     sigaction(SIGSEGV, &sa, NULL);
-    int *a = NULL;
     a[0] = 1;
-    return 0;
+    return EXIT_SUCCESS;
 }
 ],
 	rb_cv_broken_backtrace=no,
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47417)
+++ ruby_2_1/ChangeLog	(revision 47418)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Sep  6 00:47:32 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (rb_cv_broken_backtrace): exit with failure
+	  normally, no needs to abort.  [ruby-core:63678] [Bug #10008]
+
 Sat Sep  6 00:05:02 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47417)
+++ ruby_2_1/version.h	(revision 47418)
@@ -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-09-06"
-#define RUBY_PATCHLEVEL 224
+#define RUBY_PATCHLEVEL 225
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46796


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