Fix clr build on illumos-x64

[am11]

70e1072 relaxed the condition around add_subdirectory(nativeaot) in src/coreclr/CMakeLists.txt, which also enabled nativeaot runtime build on illumos-x64.

The inclusion chain:

/crossrootfs/x64/usr/include/sys/regset.h
/crossrootfs/x64/usr/include/ucontext.h
/runtime/src/coreclr/nativeaot/Runtime/unix/UnixContext.h
/runtime/src/coreclr/nativeaot/Runtime/thread.h
/runtime/src/coreclr/nativeaot/Runtime/startup.cpp

causes a conflict with redefinition of these constants: https://github.com/illumos/illumos-gate/blob/967a528a/usr/src/uts/intel/sys/regset.h#L103-L106. Those constants are unrelated to cpuidInfo on the platform (illumos x64 also uses 0, 1, 2, 3 for cpuid https://github.com/illumos/illumos-gate/blob/967a528a/usr/src/lib/libc/amd64/gen/proc64_id.c#L42).

I was going to update the cmake condition to exclude illumos, but since this naming conflict was the only error, I went ahead and prefixed the constant names with R_.

[ghost]

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas
See info in area-owners.md if you want to be subscribed.

Issue Details

---

70e1072 relaxed the condition around add_subdirectory(nativeaot) in src/coreclr/CMakeLists.txt. Which also enabled nativeaot runtime build on illumos-x64.

The inclusion chain:

/crossrootfs/x64/usr/include/sys/regset.h
/crossrootfs/x64/usr/include/ucontext.h
/runtime/src/coreclr/nativeaot/Runtime/unix/UnixContext.h
/runtime/src/coreclr/nativeaot/Runtime/thread.h
/runtime/src/coreclr/nativeaot/Runtime/startup.cpp

causes a conflict with redefinition of these constants. https://github.com/illumos/illumos-gate/blob/967a528a/usr/src/uts/intel/sys/regset.h#L103-L106. Those constants are unrelated to cpuidInfo on the platform (illumos x64 also uses 0, 1, 2, 3 for cpuid https://github.com/illumos/illumos-gate/blob/967a528a/usr/src/lib/libc/amd64/gen/proc64_id.c#L42).

I was going to update the cmake condition to exclude illumos, but since this naming conflict was the only error, I went ahead and prefixed the constant names with R_.

Author:	am11
Assignees:	-
Labels:	community-contribution, area-NativeAOT-coreclr
Milestone:	-

[janvorli]

LGTM, thank you!

[jkotas]

It would be nice to keep the shape in sync with

runtime/src/coreclr/vm/codeman.cpp

Line 1445 in ffffc4b

const int EAX = CPUID_EAX;