Pull up following revision(s) (requested by ozaki-r in ticket #1969):

	external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c: revision 1.8
	external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c: revision 1.9
	external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c: revision 1.7

PR/59659: Ryota Ozaki: Make the tool version behave the same way as the native.

ctfconvert: supply more HAVE_NBTOOL_CONFIG_H
PR toolchain/59659

Author: MartinHusemann

external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c

@@ -68,7 +68,7 @@ usage(void)
 static void
 terminate_cleanup(void)
 {
-#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__FreeBSD__) && !(defined(__NetBSD__) || HAVE_NBTOOL_CONFIG_H)
 	if (!outfile) {
 		fprintf(stderr, "Removing %s\n", infile);
 		unlink(infile);

external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c

@@ -277,7 +277,7 @@ fix_small_cpu_struct(tdata_t *td, size_t ptrsize)
 	lml->ml_next = cpum;
 }
 
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || HAVE_NBTOOL_CONFIG_H
 
 /*
  * XXX: A crude hack to bring down the number of types for a
@@ -328,13 +328,13 @@ fix_kill_attr(tdata_t *td, size_t ptrsize)
 	    fix_kill_attr_tab, NULL, NULL, NULL);
 }
 
-#endif /* __NetBSD__ */
+#endif /* __NetBSD__ || HAVE_NBTOOL_CONFIG_H */
 
 void
 cvt_fixups(tdata_t *td, size_t ptrsize)
 {
 	fix_small_cpu_struct(td, ptrsize);
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || HAVE_NBTOOL_CONFIG_H
 	fix_kill_attr(td, ptrsize);
 #endif
 }