make/autoconf/platform.m4

*** 1,7 ***
  #
! # Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ---
  #
! # Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this

*** 559,22 ***
      HOTSPOT_$1_CPU_DEFINE=AARCH64
    elif test "x$OPENJDK_$1_CPU" = xppc64; then
      HOTSPOT_$1_CPU_DEFINE=PPC64
    elif test "x$OPENJDK_$1_CPU" = xppc64le; then
      HOTSPOT_$1_CPU_DEFINE=PPC64
  
    # The cpu defines below are for zero, we don't support them directly.
    elif test "x$OPENJDK_$1_CPU" = xsparc; then
      HOTSPOT_$1_CPU_DEFINE=SPARC
    elif test "x$OPENJDK_$1_CPU" = xppc; then
      HOTSPOT_$1_CPU_DEFINE=PPC32
    elif test "x$OPENJDK_$1_CPU" = xs390; then
      HOTSPOT_$1_CPU_DEFINE=S390
    elif test "x$OPENJDK_$1_CPU" = xs390x; then
      HOTSPOT_$1_CPU_DEFINE=S390
-   elif test "x$OPENJDK_$1_CPU" = xriscv64; then
-     HOTSPOT_$1_CPU_DEFINE=RISCV
    elif test "x$OPENJDK_$1_CPU" != x; then
      HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
    fi
    AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
  
--- 559,22 ---
      HOTSPOT_$1_CPU_DEFINE=AARCH64
    elif test "x$OPENJDK_$1_CPU" = xppc64; then
      HOTSPOT_$1_CPU_DEFINE=PPC64
    elif test "x$OPENJDK_$1_CPU" = xppc64le; then
      HOTSPOT_$1_CPU_DEFINE=PPC64
+   elif test "x$OPENJDK_$1_CPU" = xriscv64; then
+     HOTSPOT_$1_CPU_DEFINE=RISCV64
  
    # The cpu defines below are for zero, we don't support them directly.
    elif test "x$OPENJDK_$1_CPU" = xsparc; then
      HOTSPOT_$1_CPU_DEFINE=SPARC
    elif test "x$OPENJDK_$1_CPU" = xppc; then
      HOTSPOT_$1_CPU_DEFINE=PPC32
    elif test "x$OPENJDK_$1_CPU" = xs390; then
      HOTSPOT_$1_CPU_DEFINE=S390
    elif test "x$OPENJDK_$1_CPU" = xs390x; then
      HOTSPOT_$1_CPU_DEFINE=S390
    elif test "x$OPENJDK_$1_CPU" != x; then
      HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
    fi
    AC_SUBST(HOTSPOT_$1_CPU_DEFINE)