nobu	2009-10-10 18:19:05 +0900 (Sat, 10 Oct 2009)

  New Revision: 25284

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

  Log:
    * configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),
      win32/mkexports.rb (each_export): exclude _threadptr_ functions.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/win32/mkexports.rb

Index: configure.in
===================================================================
--- configure.in	(revision 25283)
+++ configure.in	(revision 25284)
@@ -2089,7 +2089,9 @@
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_* $(XLDFLAGS)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
 	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
 	;;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25283)
+++ ChangeLog	(revision 25284)
@@ -1,3 +1,8 @@
+Sat Oct 10 18:19:03 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),
+	  win32/mkexports.rb (each_export): exclude _threadptr_ functions.
+
 Sat Oct 10 17:55:57 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_threadptr_errinfo): renamed.
Index: common.mk
===================================================================
--- common.mk	(revision 25283)
+++ common.mk	(revision 25284)
@@ -171,7 +171,7 @@
 
 ruby.imp: $(EXPORTOBJS)
 	@$(NM) -Pgp $(EXPORTOBJS) | \
-	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|\.)/{print $$1}' | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
 	sort -u -o $@
 
 install: install-$(INSTALLDOC)
Index: win32/mkexports.rb
===================================================================
--- win32/mkexports.rb	(revision 25283)
+++ win32/mkexports.rb	(revision 25284)
@@ -144,7 +144,7 @@
   def each_export(objs)
     objdump(objs) do |l|
       next if /@.*@/ =~ l
-      yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_((?!Init_|DllMain@).*)$/ =~ l
+      yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_((?!Init_|.*_threadptr_|DllMain@).*)$/ =~ l
     end
   end
 end
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 25283)
+++ Makefile.in	(revision 25284)
@@ -155,7 +155,7 @@
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
-		-$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' $@
+		-$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' -L '@EXPORT_PREFIX@*_threadptr_*' $@
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true

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