nobu	2013-03-29 00:55:05 +0900 (Fri, 29 Mar 2013)

  New Revision: 39989

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

  Log:
    mkmf.rb: force refererence in MAIN_DOES_NOTHING
    
    * lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
      preserved.  [ruby-core:53745] [Bug #8169]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39988)
+++ ChangeLog	(revision 39989)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Mar 29 00:54:54 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
+	  preserved.  [ruby-core:53745] [Bug #8169]
+
 Thu Mar 28 23:11:25 2013  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb: Test Windows platform by detecting LoadError when
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 39988)
+++ lib/mkmf.rb	(revision 39989)
@@ -2421,7 +2421,14 @@ MESSAGE https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2421
 
   def MAIN_DOES_NOTHING(*refs)
     src = MAIN_DOES_NOTHING
-    src = src.sub(/\{/) {$&+refs.map {|n|"(void)#{n}; "}.join("")}
+    unless refs.empty?
+      src = src.sub(/\{/) do
+        $& +
+          "\n  if (argc > 1000000) {\n" +
+          refs.map {|n|"    printf(\"%p\", &#{n});\n"}.join("") +
+          "  }\n"
+      end
+    end
     src
   end
 
@@ -2532,7 +2539,7 @@ MESSAGE https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2539
   ##
   # A C main function which does no work
 
-  MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main(void) {return 0;}'
+  MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || "int main(int argc, char **argv)\n{\n  return 0;\n}"
   UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} ||
     %w[int short long long\ long]
 

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