naruse	2019-01-26 16:59:11 +0900 (Sat, 26 Jan 2019)

  New Revision: 66924

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

  Log:
    merge revision(s) 66823,66869: [Backport #15548]
    
    Revert "mjit_worker.c: try passing -nostdlib to AIX"
    
    This reverts commit b32fb23083912c37a2601c66531ed786a7c9f3e5.
    
    This didn't work on AIX.
    
    mjit_worker.c: do not use GCC_NOSTDLIB_FLAGS for OpenBSD
    
    OpenBSD's GCC compiler has local extensions that break when
    `-nostartfiles -nodefaultlibs -nostdlib` is used.
    
    From: Jeremy Evans <merch-redmine@j...>
    
    [Bug #15548]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/mjit_worker.c
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 66923)
+++ ruby_2_6/version.h	(revision 66924)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.1"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 26
+#define RUBY_PATCHLEVEL 27
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 
Index: ruby_2_6/mjit_worker.c
===================================================================
--- ruby_2_6/mjit_worker.c	(revision 66923)
+++ ruby_2_6/mjit_worker.c	(revision 66924)
@@ -247,9 +247,9 @@ static char *libruby_pathflag; https://github.com/ruby/ruby/blob/trunk/ruby_2_6/mjit_worker.c#L247
 # define MJIT_CFLAGS_PIPE 0
 #endif
 
-// Use `-nodefaultlibs -nostdlib` for GCC where possible, which does not work on mingw and cygwin.
+// Use `-nodefaultlibs -nostdlib` for GCC where possible, which does not work on mingw, cygwin, AIX, and OpenBSD.
 // This seems to improve MJIT performance on GCC.
-#if defined __GNUC__ && !defined __clang__ && !defined(_WIN32) && !defined(__CYGWIN__)
+#if defined __GNUC__ && !defined __clang__ && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(_AIX) && !defined(__OpenBSD__)
 # define GCC_NOSTDLIB_FLAGS "-nodefaultlibs", "-nostdlib",
 #else
 # define GCC_NOSTDLIB_FLAGS /* empty */
@@ -266,7 +266,7 @@ static const char *const CC_OPTIMIZE_ARG https://github.com/ruby/ruby/blob/trunk/ruby_2_6/mjit_worker.c#L266
 static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS NULL};
 static const char *const CC_DLDFLAGS_ARGS[] = {
     MJIT_DLDFLAGS
-#if defined __GNUC__ && !defined __clang__
+#if defined __GNUC__ && !defined __clang__ && !defined(__OpenBSD__)
     "-nostartfiles",
 #endif
     GCC_NOSTDLIB_FLAGS NULL
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66923)
+++ ruby_2_6	(revision 66924)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66823,66869

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