Correctly cross compile zero variants

Author: caizixian

mmtk/Cargo.toml

@@ -18,7 +18,7 @@ lto = true
 [package.metadata.openjdk]
 # Our CI matches the following line and extract mmtk/openjdk. If this line is updated, please check ci yaml files and make sure it works.
 openjdk_repo = "https://github.com/mmtk/jdk.git"
-openjdk_version = "5fc428f6349bfa137e14a5fcebbf2cb37caeb193"
+openjdk_version = "2632c4f7b5366bed4d0cb91ea5ffe93541a70e30"
 
 [dependencies]
 libc = "0.2"

openjdk/CompileThirdPartyHeap.gmk

@@ -75,10 +75,10 @@ CARGO_TARGET_FLAG =
 ifeq ($(COMPILE_TYPE), cross)
 	ifneq ($(CREATING_BUILDJDK), true)
 		# Set the CARGO_TARGET based on the architecture
-		ifeq ($(HOTSPOT_TARGET_CPU_ARCH), riscv64)
+		ifeq ($(OPENJDK_TARGET_CPU_ARCH), riscv64)
 			CARGO_TARGET = riscv64gc-unknown-linux-gnu
 		endif
-		ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
+		ifeq ($(OPENJDK_TARGET_CPU_ARCH), aarch64)
 			CARGO_TARGET = aarch64-unknown-linux-gnu
 		endif
 		CARGO_EXECUTABLE = cross