Solaris-X64 build fails due to "Error: nreg hides the same name in an outer scope."

The Solaris-X64 'release' build fails due to:

Compiling 117 files for BUILD_java.compiler.interim
"/work/shared/mirrors/src_clones/jdk/jdk_baseline/open/src/hotspot/cpu/x86/vm_version_x86.hpp", line 637: Error: nreg hides the same name in an outer scope.
1 Error(s) detected.
make[3]: *** [/work/shared/mirrors/src_clones/jdk/jdk_baseline/build/solaris-x86_64-normal-server-release/hotspot/variant-server/tools/dtrace-gen-offsets/objs/generateJvmOffsets.o] Error 1
gensrc/GensrcDtrace.gmk:70: recipe for target '/work/shared/mirrors/src_clones/jdk/jdk_baseline/build/solaris-x86_64-normal-server-release/hotspot/variant-server/tools/dtrace-gen-offsets/objs/generateJvmOffsets.o' failed
make/Main.gmk:249: recipe for target 'hotspot-server-gensrc' failed
make[2]: *** [hotspot-server-gensrc] Error 1
make[2]: *** Waiting for unfinished jobs....
Compiling 395 files for BUILD_jdk.compiler.interim
Compiling 303 files for BUILD_jdk.javadoc.interim

ERROR: Build failed for targets 'jdk-image test-image' in configuration 'solaris-x86_64-normal-server-release' (exit code 2)