diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-13 15:47:39 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-13 15:47:39 +0000 |
| commit | aca1574676e39bec9106223a41f1f2497dcbab1c (patch) | |
| tree | 2666aedd939583551797d7d7564149cb32a05863 /dln.c | |
| parent | a1f41cafe82b6ce3074d29d809e2c5ba71e0c1e9 (diff) | |
merge revision(s) 50410,50412,50413,50414,50415,50416: [Backport #11111]
dln.c: use EXPORT_PREFIX
* configure.in (EXPORT_PREFIX): define exported symbol prefix
string in config.h.
* dln.c (FUNCNAME_PREFIX): use configured EXPORT_PREFIX, not
hardcoded condition.
* dln.c (dln_load): check if a different libruby is loaded by the
extension library, and then bail out to get rid of very frequent
reported stale bug reports.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dln.c')
| -rw-r--r-- | dln.c | 28 |
1 files changed, 22 insertions, 6 deletions
@@ -106,13 +106,12 @@ dln_loaderror(const char *format, ...) # define USE_DLN_DLOPEN #endif -#ifndef FUNCNAME_PATTERN -# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD) -# define FUNCNAME_PREFIX "_Init_" -# else -# define FUNCNAME_PREFIX "Init_" -# endif +#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD) +# define EXTERNAL_PREFIX "_" +#else +# define EXTERNAL_PREFIX "" #endif +#define FUNCNAME_PREFIX EXTERNAL_PREFIX"Init_" #if defined __CYGWIN__ || defined DOSISH #define isdirsep(x) ((x) == '/' || (x) == '\\') @@ -1330,6 +1329,23 @@ dln_load(const char *file) error = dln_strerror(); goto failed; } +# if defined RUBY_EXPORT + { + static const char incompatible[] = "incompatible library version"; + void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc"); + if (ex && ex != ruby_xmalloc) { + +# if defined __APPLE__ + /* dlclose() segfaults */ + rb_fatal("%s - %s", incompatible, file); +# else + dlclose(handle); + error = incompatible; + goto failed; +# endif + } + } +# endif init_fct = (void(*)())(VALUE)dlsym(handle, buf); if (init_fct == NULL) { |