From d054ee34663b98b4387690f83ac4d836891f9743 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 9 Mar 2024 23:09:24 +0000 Subject: link mode: dlopen/dlpreopen the static archive as needed. --- src/logic/slbt_exec_ctx.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'src/logic/slbt_exec_ctx.c') diff --git a/src/logic/slbt_exec_ctx.c b/src/logic/slbt_exec_ctx.c index 0564218..b1177db 100644 --- a/src/logic/slbt_exec_ctx.c +++ b/src/logic/slbt_exec_ctx.c @@ -205,6 +205,7 @@ int slbt_ectx_get_exec_ctx( { struct slbt_exec_ctx_impl * ictx; struct slbt_driver_ctx_impl * idctx; + struct slbt_error_info** errinfp; uint64_t fmask; char ** parg; char ** src; @@ -635,12 +636,30 @@ int slbt_ectx_get_exec_ctx( for (; *dlopenv; ) { arname = ictx->sbuf; strcpy(arname,*dlopenv); - slbt_adjust_wrapper_argument(arname,true); - if (slbt_ar_get_archive_ctx(dctx,arname,dlactxv) < 0) - return slbt_ectx_free_exec_ctx_impl( - ictx, - SLBT_NESTED_ERROR(dctx)); + slbt_adjust_wrapper_argument( + arname,true, + ".expsyms.a"); + + errinfp = idctx->errinfp; + + if (slbt_ar_get_archive_ctx(dctx,arname,dlactxv) < 0) { + strcpy(arname,*dlopenv); + + slbt_adjust_wrapper_argument( + arname,true, + dctx->cctx->settings.arsuffix); + + if (slbt_ar_get_archive_ctx(dctx,arname,dlactxv) < 0) + return slbt_ectx_free_exec_ctx_impl( + ictx, + SLBT_NESTED_ERROR(dctx)); + + idctx->errinfp = errinfp; + + for (; *errinfp; ) + *errinfp++ = 0; + } if (slbt_ar_update_syminfo(*dlactxv,&ictx->ctx) < 0) return slbt_ectx_free_exec_ctx_impl( -- cgit v1.2.3