aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2020-04-28 18:53:49 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2020-04-28 18:53:49 +0000
commit75a813087a5bba4504efe6695411715f6352a8a8 (patch)
tree18feb0cec3e233f26a3f4671a4eb8bdc6ad42ba4 /cddl/contrib
parentfe6da72759058b157fcab8520ce5fef153b84e9b (diff)
downloadsrc-75a813087a5bba4504efe6695411715f6352a8a8.tar.gz
src-75a813087a5bba4504efe6695411715f6352a8a8.zip
Revert r360445
I did not intend to commit this yet as more work is needed for non-amd64 kernels.
Notes
Notes: svn path=/head/; revision=360448
Diffstat (limited to 'cddl/contrib')
-rw-r--r--cddl/contrib/opensolaris/tools/ctf/cvt/merge.c8
-rw-r--r--cddl/contrib/opensolaris/tools/ctf/cvt/util.c10
2 files changed, 10 insertions, 8 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
index 45486ff9c2d2..3dc2ad0cbdad 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
@@ -452,10 +452,6 @@ map_td_tree_post(tdesc_t *ctdp, tdesc_t **ctdpp __unused, void *private)
if (ed.ed_tgt->t_type == FORWARD && ctdp->t_type != FORWARD) {
int id = mcd->md_tgt->td_nextid++;
-#ifdef __FreeBSD__
- if (CTF_TYPE_ISCHILD(id))
- terminate("No room for additional types\n");
-#endif
debug(3, "Creating new defn type %d <%x>\n", id, id);
add_mapping(mcd->md_ta, ctdp->t_id, id);
alist_add(mcd->md_fdida, (void *)(ulong_t)ed.ed_tgt,
@@ -477,10 +473,6 @@ map_td_tree_post(tdesc_t *ctdp, tdesc_t **ctdpp __unused, void *private)
} else {
int id = mcd->md_tgt->td_nextid++;
-#ifdef __FreeBSD__
- if (CTF_TYPE_ISCHILD(id))
- terminate("No room for additional types\n");
-#endif
debug(3, "Creating new type %d <%x>\n", id, id);
add_mapping(mcd->md_ta, ctdp->t_id, id);
hash_add(mcd->md_tdtba, ctdp);
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/util.c b/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
index 87f677b7b81a..fb76cbaeb422 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
@@ -148,7 +148,17 @@ terminate(const char *format, ...)
if (getenv("CTF_ABORT_ON_TERMINATE") != NULL)
abort();
+#if defined(__FreeBSD__)
+/*
+ * For the time being just output the termination message, but don't
+ * return an exit status that would cause the build to fail. We need
+ * to get as much stuff built as possible before going back and
+ * figuring out what is wrong with certain files.
+ */
+ exit(0);
+#else
exit(1);
+#endif
}
/*PRINTFLIKE1*/