 @@ -1,14 +1,14 @@
-/*      $NetBSD: rumpuser_dl.c,v 1.31 2019/12/26 04:53:11 msaitoh Exp $	*/
+/*      $NetBSD: rumpuser_dl.c,v 1.32 2020/03/21 04:48:37 pgoyette Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -30,31 +30,36 @@
  * Called during rump bootstrap.
  */
 /*
  * Solaris libelf.h doesn't support _FILE_OFFSET_BITS=64.  Luckily,
  * for this module it doesn't matter.
  */
 #if defined(__sun__)
 #define RUMPUSER_NO_FILE_OFFSET_BITS
 #endif
 #include "rumpuser_port.h"
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.31 2019/12/26 04:53:11 msaitoh Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.32 2020/03/21 04:48:37 pgoyette Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/time.h>
 #ifdef NOTYET
 #include <sys/evcnt.h>
 #endif
 #include <assert.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <rump/rumpuser.h>
 @@ -343,38 +348,66 @@ getsymbols(struct link_map *map, int ism
 		strtaboff += strlen(cursymname)+1;
+	}
 	return 0;
+}
 static void
 process_object(void *handle,
 	rump_modinit_fn domodinit, rump_compload_fn docompload)
+{
 	const struct modinfo *const *mi_start, *const *mi_end;
 	struct rump_component *const *rc, *const *rc_end;
 	struct sysctllog;
 	typedef void sysctl_setup_func(struct sysctllog **);
 	sysctl_setup_func *const *sfp, *const *sfp_end;
 #ifdef NOTYET	/* We don't yet handle link_set_evcnts */
 	struct evcnt *const *evp, *const *evp_end;
 #endif
 	mi_start = dlsym(handle, "__start_link_set_modules");
 	mi_end = dlsym(handle, "__stop_link_set_modules");
 	if (mi_start && mi_end)
 		domodinit(mi_start, (size_t)(mi_end-mi_start));
 	rc = dlsym(handle, "__start_link_set_rump_components");
 	rc_end = dlsym(handle, "__stop_link_set_rump_components");
 	if (rc && rc_end) {
 		for (; rc < rc_end; rc++)
 			docompload(*rc);
 		assert(rc == rc_end);
+	}
 	/* handle link_set_sysctl_funcs */
 	sfp = dlsym(handle, "__start_link_set_sysctl_funcs");
 	sfp_end = dlsym(handle, "__stop_link_set_sysctl_funcs");
 	if (sfp && sfp_end) {
 		for (; sfp < sfp_end; sfp++)
 			(**sfp)(NULL);
 		assert(sfp == sfp_end);
+	}
 #ifdef NOTYET
 	/* handle link_set_evcnts */
 	evp = dlsym(handle, "__start_link_set_evcnts");
 	evp_end = dlsym(handle, "__stop_link_set_evcnts");
 	if (evp && evp_end) {
 		for (; evp < evp_end; evp++)
 			evcnt_attach_static(*evp);
 		assert(evp == evp_end);
+	}
 #endif
+}
 /*
  * Get the linkmap from the dynlinker.  Try to load kernel modules
  * from all objects in the linkmap.
  */
 void
 rumpuser_dl_bootstrap(rump_modinit_fn domodinit,
 	rump_symload_fn symload, rump_compload_fn compload)
+{
 	struct link_map *map, *origmap, *mainmap;
 	void *mainhandle;
 	int error;

 @@ -1,28 +1,42 @@
-/*	$NetBSD: ldscript.rump,v 1.3 2014/04/23 17:05:18 pooka Exp $	*/
+/*	$NetBSD: ldscript.rump,v 1.4 2020/03/21 04:48:38 pgoyette Exp $	*/
 /*
  * From binutils 2.19 onwards (in NetBSD) binutils ld PROVIDEs
  * __start/__stop for orphaned sections.  This means that
  * __start_link_set_modules/__stop_link_set_modules will no
  * longer automatically be present in shared libraries.  This
  * ldscript forces those symbols to be present for all rump
  * shared lib components.
  */
 SECTIONS
+{
 	link_set_modules :
+	{
 		__start_link_set_modules = .;
 		*(link_set_modules);
 		__stop_link_set_modules = .;
+	}
 	link_set_rump_components :
+	{
 		__start_link_set_rump_components = .;
 		*(link_set_rump_components);
 		__stop_link_set_rump_components = .;
+	}
 	link_set_sysctl_funcs :
+	{
 		__start_link_set_sysctl_funcs = .;
 		*(link_set_sysctl_funcs);
 		__stop_link_set_sysctl_funcs = .;
+	}
 	link_set_rump_components :
+	{
 		__start_link_set_evcnts = .;
 		*(link_set_evcnts);
 		__stop_link_set_evcnts = .;
+	}
+}
 INSERT AFTER .data;