rumpbake_main<n> -> rumprun_main<n>

Avoids the problematic term "rumpbake", and the
function name is more a property of rumprun anyway.

diff --git a/app-tools/rumprun-bake.in b/app-tools/rumprun-bake.in
index f149f8d0d76591aab1434f0fecb94a114012b4e4..129e86ec3e0b44bead91718edbc3598a1a6c783e 100644 (file)
--- a/app-tools/rumprun-bake.in
+++ b/app-tools/rumprun-bake.in
@@ -378,7 +378,7 @@ for f in "$@"; do
        _getbininfo ${f}
 
        ${runcmd} ${RUMPBAKE_TOOLDIR}/bin/${RUMPBAKE_TUPLE}-objcopy     \
-           --redefine-sym main=rumpbake_main${objnum}                  \
+           --redefine-sym main=rumprun_main${objnum}                   \
            ${f} ${TMPDIR}/tmp${objnum}.obj
        allobjs="${allobjs} ${TMPDIR}/tmp${objnum}.obj"
        objnum=$((${objnum}+1))

diff --git a/lib/librumprun_base/main.c b/lib/librumprun_base/main.c
index 70574f8b8ebf5b13ca45b3d55184d7667a02309a..10c56ce7044ee87d9b68a63ecb1b66bfdfd8d494 100644 (file)
--- a/lib/librumprun_base/main.c
+++ b/lib/librumprun_base/main.c
@@ -31,23 +31,22 @@
 
 /*
  * for baking multiple executables into a single binary
- * XXX: should not depend on explicit symbol names with hardcoded
- * limits
+ * TODO: remove hardcoded limit
  */
 mainlike_fn rumprun_notmain;
-mainlike_fn rumpbake_main1;
-mainlike_fn rumpbake_main2;
-mainlike_fn rumpbake_main3;
-mainlike_fn rumpbake_main4;
-mainlike_fn rumpbake_main5;
-mainlike_fn rumpbake_main6;
-mainlike_fn rumpbake_main7;
-mainlike_fn rumpbake_main8;
+mainlike_fn rumprun_main1;
+mainlike_fn rumprun_main2;
+mainlike_fn rumprun_main3;
+mainlike_fn rumprun_main4;
+mainlike_fn rumprun_main5;
+mainlike_fn rumprun_main6;
+mainlike_fn rumprun_main7;
+mainlike_fn rumprun_main8;
 
 #define RUNMAIN(i)                                                     \
-       if (rumpbake_main##i == rumprun_notmain)                        \
+       if (rumprun_main##i == rumprun_notmain)                         \
                break;                                                  \
-       rumprun(rre->rre_flags, rumpbake_main##i,                       \
+       rumprun(rre->rre_flags, rumprun_main##i,                        \
            rre->rre_argc, rre->rre_argv);                              \
        if ((rre->rre_flags & RUMPRUN_EXEC_CMDLINE) == 0)               \
                rre = TAILQ_NEXT(rre, rre_entries);                     \

diff --git a/lib/librumprun_base/rumprun.c b/lib/librumprun_base/rumprun.c
index 1cdce3db201f93913b247d26c09b295dee8d7213..dca78e764715765e311b2bc1820f07107c4f1f6c 100644 (file)
--- a/lib/librumprun_base/rumprun.c
+++ b/lib/librumprun_base/rumprun.c
@@ -63,14 +63,14 @@ rumprun_enosys(void)
        return ENOSYS;
 }
 __strong_alias(rumprun_notmain,rumprun_enosys);
-__weak_alias(rumpbake_main1,rumprun_notmain);
-__weak_alias(rumpbake_main2,rumprun_notmain);
-__weak_alias(rumpbake_main3,rumprun_notmain);
-__weak_alias(rumpbake_main4,rumprun_notmain);
-__weak_alias(rumpbake_main5,rumprun_notmain);
-__weak_alias(rumpbake_main6,rumprun_notmain);
-__weak_alias(rumpbake_main7,rumprun_notmain);
-__weak_alias(rumpbake_main8,rumprun_notmain);
+__weak_alias(rumprun_main1,rumprun_notmain);
+__weak_alias(rumprun_main2,rumprun_notmain);
+__weak_alias(rumprun_main3,rumprun_notmain);
+__weak_alias(rumprun_main4,rumprun_notmain);
+__weak_alias(rumprun_main5,rumprun_notmain);
+__weak_alias(rumprun_main6,rumprun_notmain);
+__weak_alias(rumprun_main7,rumprun_notmain);
+__weak_alias(rumprun_main8,rumprun_notmain);
 
 __weak_alias(rump_init_server,rumprun_enosys);