-#define TEXT_SET(set, sym) MAKE_SET(set, sym, 5)
-#define DATA_SET(set, sym) MAKE_SET(set, sym, 7)
-#define BSS_SET(set, sym) MAKE_SET(set, sym, 9)
-#define ABS_SET(set, sym) MAKE_SET(set, sym, 3)
+/*
+ * Extended linker set API.
+ *
+ * Since linker sets are per-object-file, and we may have multiple
+ * object files, we need to be able to specify which object's set
+ * to scan.
+ *
+ * The set itself is a contiguous array of pointers to the objects
+ * within the set.
+ */
+
+/*
+ * Public interface.
+ *
+ * void **LINKER_SET_OBJECT_BEGIN(_object, _set)
+ * Preferred interface to linker_set_object_begin(), takes set name unquoted.
+ * void **LINKER_SET_OBJECT_LIMIT(_object, _set)
+ * Preferred interface to linker_set_object_begin(), takes set name unquoted.
+ * LINKER_SET_OBJECT_FOREACH(_object, (set_member_type **)_pvar, _cast, _set)
+ * Iterates over the members of _set within _object. Since the set contains
+ * pointers to its elements, for a set of elements of type etyp, _pvar must
+ * be (etyp **).
+ * LINKER_SET_FOREACH((set_member_type **)_pvar, _cast, _set)
+ *
+ * Example of _cast: For the _pvar "struct sysctl_oid **oidpp", _cast would be
+ * "struct sysctl_oid **"
+ *
+ */
+
+#define LINKER_SET_OBJECT_BEGIN(_object, _set) __linker_set_object_begin(_object, _set)
+#define LINKER_SET_OBJECT_LIMIT(_object, _set) __linker_set_object_limit(_object, _set)
+
+#define LINKER_SET_OBJECT_FOREACH(_object, _pvar, _cast, _set) \
+ for (_pvar = (_cast) LINKER_SET_OBJECT_BEGIN(_object, _set); \
+ _pvar < (_cast) LINKER_SET_OBJECT_LIMIT(_object, _set); \
+ _pvar++)
+
+#define LINKER_SET_OBJECT_ITEM(_object, _cast, _set, _i) \
+ (((_cast)(LINKER_SET_OBJECT_BEGIN(_object, _set)))[_i])