usa	2012-11-08 14:14:10 +0900 (Thu, 08 Nov 2012)

  New Revision: 37552

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

  Log:
    merge revision(s) 37296: [Backport #7205]
    
    * configure.in (visibility_option): visibility attribute is not
      available before GCC 4, so do not use -fvisibility option in that
      case.  [ruby-core:48147] [Bug #7205]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 37551)
+++ ruby_1_9_3/configure.in	(revision 37552)
@@ -496,7 +496,15 @@
     AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"])
 fi
 if test "$GCC" = yes; then
-    RUBY_TRY_CFLAGS(-fvisibility=hidden, [RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+	@%:@if !(defined __GNUC__ && __GNUC__ >= 4)
+	@%:@error not GCC 4 or later
+	>>>not GCC 4 or later<<<
+	@%:@endif])],
+	[visibility_option=yes], [visibility_option=no])
+    if test "$visibility_option" = yes; then
+	RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
+    fi
     AC_SUBST(WERRORFLAG, "-Werror")
     if test "$visibility_option" = yes; then
 	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37551)
+++ ruby_1_9_3/ChangeLog	(revision 37552)
@@ -1,3 +1,9 @@
+Thu Nov  8 14:13:53 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (visibility_option): visibility attribute is not
+	  available before GCC 4, so do not use -fvisibility option in that
+	  case.  [ruby-core:48147] [Bug #7205]
+
 Thu Nov  8 14:11:49 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm.c (rb_vm_jump_tag_but_local_jump): pass through thrown objects.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37551)
+++ ruby_1_9_3/version.h	(revision 37552)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 308
+#define RUBY_PATCHLEVEL 309
 
 #define RUBY_RELEASE_DATE "2012-11-08"
 #define RUBY_RELEASE_YEAR 2012

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37296


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