From d054ee34663b98b4387690f83ac4d836891f9743 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 9 Mar 2024 23:09:24 +0000
Subject: link mode: dlopen/dlpreopen the static archive as needed.

---
 src/internal/slibtool_linkcmd_impl.h     |  3 ++-
 src/logic/linkcmd/slbt_linkcmd_archive.c |  4 +++-
 src/logic/linkcmd/slbt_linkcmd_argv.c    |  5 +++--
 src/logic/slbt_exec_ctx.c                | 29 ++++++++++++++++++++++++-----
 4 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/internal/slibtool_linkcmd_impl.h b/src/internal/slibtool_linkcmd_impl.h
index 8451810..bc57f3d 100644
--- a/src/internal/slibtool_linkcmd_impl.h
+++ b/src/internal/slibtool_linkcmd_impl.h
@@ -29,7 +29,8 @@ bool slbt_adjust_object_argument(
 
 bool slbt_adjust_wrapper_argument(
 	char *		arg,
-	bool		fpic);
+	bool		fpic,
+	const char *    suffix);
 
 int slbt_adjust_linker_argument(
 	const struct slbt_driver_ctx *	dctx,
diff --git a/src/logic/linkcmd/slbt_linkcmd_archive.c b/src/logic/linkcmd/slbt_linkcmd_archive.c
index 93237dd..5f1ba52 100644
--- a/src/logic/linkcmd/slbt_linkcmd_archive.c
+++ b/src/logic/linkcmd/slbt_linkcmd_archive.c
@@ -156,7 +156,9 @@ slbt_hidden int slbt_exec_link_create_archive(
 
 	/* input objects associated with .la archives */
 	for (parg=ectx->cargv; *parg; parg++)
-		if (slbt_adjust_wrapper_argument(*parg,true))
+		if (slbt_adjust_wrapper_argument(
+				*parg,true,
+				dctx->cctx->settings.arsuffix))
 			if (slbt_util_import_archive(ectx,output,*parg))
 				return SLBT_NESTED_ERROR(dctx);
 
diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c
index a0c342c..e50f6d9 100644
--- a/src/logic/linkcmd/slbt_linkcmd_argv.c
+++ b/src/logic/linkcmd/slbt_linkcmd_argv.c
@@ -170,7 +170,8 @@ slbt_hidden bool slbt_adjust_object_argument(
 
 slbt_hidden bool slbt_adjust_wrapper_argument(
 	char *		arg,
-	bool		fpic)
+	bool		fpic,
+	const char *    suffix)
 {
 	char *	slash;
 	char *	dot;
@@ -199,7 +200,7 @@ slbt_hidden bool slbt_adjust_wrapper_argument(
 		dot = strrchr(arg,'.');
 	}
 
-	strcpy(dot,".a");
+	strcpy(dot,suffix);
 	return true;
 }
 
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