openjdk-1.8.0/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch

40 lines
1.4 KiB
Diff
Raw Normal View History

From ae2c3958cb7e238c1112de18e216f82b72771db0 Mon Sep 17 00:00:00 2001
Date: Fri, 22 Jan 2021 16:23:19 +0800
Subject: Test8167409.sh fails to run with 32bit jdk on 64bit
system
2020-09-11 18:42:18 +08:00
Summary: <test case>: Test8167409.sh fails to run with 32bit jdk on 64bit system
LLT: jdk8u/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh
---
.../criticalnatives/argumentcorruption/Test8167409.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh
2023-01-28 14:19:32 +08:00
index e2de2d3e55..7d0431980e 100644
2020-09-11 18:42:18 +08:00
--- a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh
+++ b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh
2023-01-28 14:19:32 +08:00
@@ -62,6 +62,11 @@ case "$OS" in
2020-09-11 18:42:18 +08:00
;;
esac
2023-01-28 14:19:32 +08:00
2020-09-11 18:42:18 +08:00
+${TESTJAVA}${FS}bin${FS}java -XshowSettings 2>&1 | grep sun.arch.data.model | grep 32
+if [ 0 -eq $? ] ; then
+ M32="-m32"
+fi
2023-01-28 14:19:32 +08:00
+
2021-05-19 17:01:47 +08:00
# CriticalJNINatives is not supported for aarch64
2023-05-06 10:57:30 +08:00
if [ $VM_CPU = "aarch64" ]; then
2021-05-19 17:01:47 +08:00
echo "Test Passed"
2023-01-28 14:19:32 +08:00
@@ -73,7 +78,7 @@ THIS_DIR=.
2020-09-11 18:42:18 +08:00
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
${TESTJAVA}${FS}bin${FS}javac *.java
2023-01-28 14:19:32 +08:00
-$cc_cmd ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \
+$cc_cmd ${M32} ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \
2020-09-11 18:42:18 +08:00
-I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
${TESTSRC}${FS}libCNCheckLongArgs.c
--
2.19.0