[riscv64-8u]vm_version.cpp:206:16: error: expected ';' before 'S390_ONLY'

[sendaoYan]

rm -f vm_version.o
/usr/bin/g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/prims -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/x86/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os_cpu/linux_x86/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/linux/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"25.412-b00\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"yansendao\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DJRE_RELEASE_VERSION="\"1.8.0_412-internal-_2024_06_18_18_26-b00\"" -DVENDOR='"yansendao"' -DVENDOR_URL='"https://github.com/sendaoYan"' -DVENDOR_URL_BUG='"mailto:yansendao.ysd@alibaba-inc.com"' -DVENDOR_URL_VM_BUG='"mailto:yansendao.ysd@alibaba-inc.com"' -DVENDOR='"yansendao"' -DVENDOR_URL='"https://github.com/sendaoYan"' -DVENDOR_URL_BUG='"mailto:yansendao.ysd@alibaba-inc.com"' -DVENDOR_URL_VM_BUG='"mailto:yansendao.ysd@alibaba-inc.com"' -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_gcc -DINCLUDE_JFR=1 -DCOMPILER2 -DCOMPILER1 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64  -pipe -fno-strict-aliasing  -fno-omit-frame-pointer -O3  -g -DVM_LITTLE_ENDIAN -D_LP64=1 -Werror -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wformat=2 -Wreturn-type   -fstack-protector  -fno-delete-null-pointer-checks -fno-lifetime-dse -std=gnu++98 -c -MMD -MP -MF ../generated/dependencies/vm_version.o.d -fpch-deps -o vm_version.o /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp 
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp: In static member function 'static const char* Abstract_VM_Version::vm_platform_string()':
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp:206:16: error: expected ';' before 'S390_ONLY'
  206 |   return OS "-" CPU;
      |                ^
      |                ;
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp:199:18: error: 'S390_ONLY' was not declared in this scope
  199 |                  S390_ONLY("s390")               \
      |                  ^~~~~~~~~
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp:206:17: note: in expansion of macro 'CPU'
  206 |   return OS "-" CPU;
      |                 ^~~
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp: In static member function 'static const char* Abstract_VM_Version::internal_vm_info_string()':
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp:311:48: error: expected ';' before 'S390_ONLY'
  311 |   return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
      |                                                ^
      |                                                ;
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp:199:18: error: 'S390_ONLY' was not declared in this scope
  199 |                  S390_ONLY("s390")               \
      |                  ^~~~~~~~~
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/vm_version.cpp:311:49: note: in expansion of macro 'CPU'
  311 |   return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
      |                                                 ^~~

make-aarch64.log make-x86_64.log

[sendaoYan]

diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/hotspot/src/share/vm/runtime/vm_version.cpp
index c75ff7c31ac..e0642c69b51 100644
--- a/hotspot/src/share/vm/runtime/vm_version.cpp
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp
@@ -196,7 +196,7 @@ const char* Abstract_VM_Version::jre_release_version() {
 #else
 #define CPU      IA32_ONLY("x86")                \
                  IA64_ONLY("ia64")               \
-                 S390_ONLY("s390")               \
+                 AMD64_ONLY("amd64")             \
                  SPARC_ONLY("sparc")             \
                  RISCV64_ONLY("riscv64")
 #endif // !ZERO