mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),
win32/mkexports.rb (each_export): exclude _threadptr_ functions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
478d3535ef
commit
66150a89a6
5 changed files with 11 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sat Oct 10 18:19:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* 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@ruby-lang.org>
|
Sat Oct 10 17:55:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* eval.c (rb_threadptr_errinfo): renamed.
|
* eval.c (rb_threadptr_errinfo): renamed.
|
||||||
|
|
|
@ -155,7 +155,7 @@ $(LIBRUBY_A):
|
||||||
$(LIBRUBY_SO):
|
$(LIBRUBY_SO):
|
||||||
@-$(PRE_LIBRUBY_UPDATE)
|
@-$(PRE_LIBRUBY_UPDATE)
|
||||||
$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
|
$(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; \
|
@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
|
||||||
File.symlink "$(LIBRUBY_SO)", link}' \
|
File.symlink "$(LIBRUBY_SO)", link}' \
|
||||||
$(LIBRUBY_ALIASES) || true
|
$(LIBRUBY_ALIASES) || true
|
||||||
|
|
|
@ -171,7 +171,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
|
||||||
|
|
||||||
ruby.imp: $(EXPORTOBJS)
|
ruby.imp: $(EXPORTOBJS)
|
||||||
@$(NM) -Pgp $(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 $@
|
sort -u -o $@
|
||||||
|
|
||||||
install: install-$(INSTALLDOC)
|
install: install-$(INSTALLDOC)
|
||||||
|
|
|
@ -2089,7 +2089,9 @@ if test "$enable_shared" = 'yes'; then
|
||||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
|
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
|
||||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
|
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
|
||||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
|
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_SO='lib$(RUBY_SO_NAME).dylib'
|
||||||
LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
|
LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -144,7 +144,7 @@ class Exports::Cygwin < Exports
|
||||||
def each_export(objs)
|
def each_export(objs)
|
||||||
objdump(objs) do |l|
|
objdump(objs) do |l|
|
||||||
next if /@.*@/ =~ 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
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue