dtrace, drti, libdtrace: fix type redefintion errors

[christos]

Summary

They couldn't compile due to type redefintion errors. Below is a sample from the compiler output:

/usr/include/x86/_types.h:109:20: error: redefinition of typedef '__uintfptr_t' is a C11 feature [-Werror,-
typedef __uint64_t      __uintfptr_t;
                        ^
/mnt/src/sys/sys/_types.h:78:20: note: previous definition is here
typedef __uint64_t      __uintfptr_t;
                        ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.
*** Error code 1

There might be more files that need to be modified, but these are the
ones I could find.

[markj]

I think this is probably right. The build shouldn't be setting the include path this way. libdtrace and drti need similar patches.

Just for context, the problem arose when trying to compile just dtrace(1) from the main branch on a system running 13.0, yes?

[christos]

In D35281#800257, @markj wrote:

I think this is probably right. The build shouldn't be setting the include path this way. libdtrace and drti need similar patches.

I can take care of them.

Just for context, the problem arose when trying to compile just dtrace(1) from the main branch on a system running 13.0, yes?

IIRC, it happened on both my host running 13.0 kernel and world and my bhyve
guest running -CURRENT kernel but 13.0 world. In any case, I tried building from
the main branch.

[christos]

Bump.

[christos]

Bump. Is this still relevant?

[markj]

In D35281#865144, @christos wrote:

Bump. Is this still relevant?

Sorry, yes probably still relevant, I just haven't tried to test it. I guess it should happen if I try to build cddl/lib/libdtrace directly with an empty /usr/obj?

[christos]

In D35281#865307, @markj wrote:

Sorry, yes probably still relevant, I just haven't tried to test it. I guess it should happen if I try to build cddl/lib/libdtrace directly with an empty /usr/obj?

IIRC yes.

[markj]

I've been carrying this patch in my local tree for a while. I'm not quite sure why it was fine before, but now it causes the libdtrace build to fail: libdtrace builds sys/cddl/dev/dtrace/x86/instr_size.c, which includes <cddl/dev/dtrace/dtrace_cddl.h>, which only works if sys/ is in the include path. In particular, dtrace_cddl.h doesn't get installed to /usr/include.

[christos]

In D35281#907138, @markj wrote:

I've been carrying this patch in my local tree for a while. I'm not quite sure why it was fine before, but now it causes the libdtrace build to fail: libdtrace builds sys/cddl/dev/dtrace/x86/instr_size.c, which includes <cddl/dev/dtrace/dtrace_cddl.h>, which only works if sys/ is in the include path. In particular, dtrace_cddl.h doesn't get installed to /usr/include.

Yeah. I think we should abandon this one.