Skip to content
Snippets Groups Projects
Commit 2b7e6938 authored by Vivek Das Mohapatra's avatar Vivek Das Mohapatra
Browse files

Version-lock capsule_metadata struct to a particular libcapsule ABI

parent c2ac755e
No related branches found
No related tags found
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
...@@ -170,6 +170,10 @@ get_capsule_metadata (struct link_map *map, ptr_list *info, const char *only) ...@@ -170,6 +170,10 @@ get_capsule_metadata (struct link_map *map, ptr_list *info, const char *only)
if( only && strcmp( only, meta->soname ) ) if( only && strcmp( only, meta->soname ) )
continue; continue;
// not a version of the ABI we understand? skip it.
if( meta->capsule_abi != 0 )
continue;
meta->namespace = LM_ID_NEWLM; meta->namespace = LM_ID_NEWLM;
meta->closed = 0; meta->closed = 0;
......
...@@ -99,6 +99,7 @@ struct _capsule_metadata ...@@ -99,6 +99,7 @@ struct _capsule_metadata
const char **export; const char **export;
const char **nowrap; const char **nowrap;
capsule_item *dl_wrappers; capsule_item *dl_wrappers;
const int capsule_abi;
/*< private >*/ /*< private >*/
int closed; int closed;
char *active_prefix; char *active_prefix;
......
...@@ -334,6 +334,7 @@ capsule_metadata capsule_meta = ...@@ -334,6 +334,7 @@ capsule_metadata capsule_meta =
.export = valid_dlsym_sources, .export = valid_dlsym_sources,
.nowrap = invalid_dl_reloc_targets, .nowrap = invalid_dl_reloc_targets,
.dl_wrappers = EXT_DLOPEN_WRAPPERS, .dl_wrappers = EXT_DLOPEN_WRAPPERS,
.capsule_abi = 0,
}; };
// ------------------------------------------------------------- // -------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment