From f04daf3bb8696be31ba95fa58630045933ca2057 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Apr 2013 00:49:52 +0000
Subject: merge revision(s) 36338: [Backport #6709]

	* configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
	  instead of TARGET which may contain non-identifer characters.

	* lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
	  part consists of only word characters.  [ruby-core:46248][Bug #6709]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 8 ++++++++
 configure.in | 6 +++---
 lib/mkmf.rb  | 4 +++-
 version.h    | 6 +++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ab6230a26..07b469fcb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr  4 09:44:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
+	  instead of TARGET which may contain non-identifer characters.
+
+	* lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
+	  part consists of only word characters.  [ruby-core:46248][Bug #6709]
+
 Tue Apr  2 13:13:19 2013  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* transcode.c (documentation for str_encode): Explain
diff --git a/configure.in b/configure.in
index 1f79b580d1..849bb7b7d0 100644
--- a/configure.in
+++ b/configure.in
@@ -2065,7 +2065,7 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes],
         [aix*], [	: ${LDSHARED='$(CC)'}
 			LDSHARED="$LDSHARED ${linker_flag}-G"
-			EXTDLDFLAGS='-eInit_$(TARGET)'
+			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
 			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
 			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
 			: ${ARCHFILE="ruby.imp"}
@@ -2082,7 +2082,7 @@ if test "$with_dln_a_out" != yes; then
 	[beos*], [	AS_CASE(["$target_cpu"],
 			  [powerpc*], [
 			    : ${LDSHARED="ld -xms"}
-			    EXTDLDFLAGS='-export Init_$(TARGET)'
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
 			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
 			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
 			    ],
@@ -2096,7 +2096,7 @@ if test "$with_dln_a_out" != yes; then
 	[haiku*], [	AS_CASE(["$target_cpu"],
 			  [powerpc*], [
 			    : ${LDSHARED="ld -xms"}
-			    EXTDLDFLAGS='-export Init_$(TARGET)'
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
 			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ],
 			  [i586*], [
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 00323a34f8..a7517615ff 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1925,7 +1925,7 @@ def create_makefile(target, srcprefix = nil)
         makedef = %{-pe "$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
       end
     else
-      makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}' + 'Init_$(TARGET)'.sub(/\\..*\\z/,'')"}
+      makedef = %{-e "puts 'EXPORTS', '$(TARGET_ENTRY)'"}
     end
     if makedef
       $cleanfiles << '$(DEFFILE)'
@@ -1969,6 +1969,8 @@ LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
 SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
 OBJS = #{$objs.join(" ")}
 TARGET = #{target}
+TARGET_NAME = #{target && target[/\A\w+/]}
+TARGET_ENTRY = #{EXPORT_PREFIX || ''}Init_$(TARGET_NAME)
 DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
diff --git a/version.h b/version.h
index 4f9169781c..c5a7ec7886 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 408
+#define RUBY_PATCHLEVEL 409
 
-#define RUBY_RELEASE_DATE "2013-04-02"
+#define RUBY_RELEASE_DATE "2013-04-04"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3