From 7b835184d7dfbf503607b80e33ebf2349d6f7ab6 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 28 Oct 2017 23:54:16 +0000 Subject: [PATCH] Localize EC functions git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 2 +- common.mk | 2 +- win32/mkexports.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0c14219204..0ae2abba3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -255,7 +255,7 @@ $(LIBRUBY_SO): $(ECHO) linking shared-library $@ $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@ -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \ - -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ + -L '$(SYMBOL_PREFIX)*_threadptr_*' -L '$(SYMBOL_PREFIX)*_ec_*' $@ $(Q) $(POSTLINK) @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \ File.symlink "$(LIBRUBY_SO)", link}' \ diff --git a/common.mk b/common.mk index b755cd65f6..d09a583d2f 100644 --- a/common.mk +++ b/common.mk @@ -289,7 +289,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) ruby.imp: $(COMMONOBJS) $(Q)$(NM) -Pgp $(COMMONOBJS) | \ - awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|ruby_static_id_|.*_threadptr_|\.)/{print $$1}' | \ + awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|ruby_static_id_|.*_threadptr_|rb_ec_\.)/{print $$1}' | \ sort -u -o $@ install: install-$(INSTALLDOC) diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 3399db71b4..7672ac307c 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -7,7 +7,7 @@ module RbConfig end class Exports - PrivateNames = /(?:Init_|ruby_static_id_|.*_threadptr_|DllMain\b)/ + PrivateNames = /(?:Init_|ruby_static_id_|.*_threadptr_|rb_ec_|DllMain\b)/ @@subclass = [] def self.inherited(klass)