Skip to content

Commit 7024bf0

Browse files
zzambersjerboaa
authored andcommitted
8296959: Fix hotspot shell tests of 8u on multilib systems
Reviewed-by: sgehwolf
1 parent 17fd40a commit 7024bf0

File tree

8 files changed

+13
-16
lines changed

8 files changed

+13
-16
lines changed

Diff for: hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ THIS_DIR=.
7373
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
7474
${TESTJAVA}${FS}bin${FS}javac *.java
7575

76-
$cc_cmd -fPIC -shared -o libCNCheckLongArgs.so \
76+
$cc_cmd ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \
7777
-I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
7878
${TESTSRC}${FS}libCNCheckLongArgs.c
7979

Diff for: hotspot/test/runtime/7107135/Test7107135.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ THIS_DIR=.
6565
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
6666
${TESTJAVA}${FS}bin${FS}javac *.java
6767

68-
$gcc_cmd -fPIC -shared -c -o test.o \
68+
$gcc_cmd ${CFLAGBITS} -fPIC -shared -c -o test.o \
6969
-I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
7070
${TESTSRC}${FS}test.c
7171

Diff for: hotspot/test/runtime/InitialThreadOverflow/testme.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ if [ "x$gcc_cmd" = "x" ]; then
4949
exit 0;
5050
fi
5151

52-
CFLAGS="-m${VM_BITS}"
53-
5452
LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
5553
export LD_LIBRARY_PATH
5654

@@ -59,12 +57,11 @@ cp ${TESTSRC}${FS}invoke.cxx .
5957
# Copy the result of our @compile action:
6058
cp ${TESTCLASSES}${FS}DoOverflow.class .
6159

62-
echo "Compilation flag: ${COMP_FLAG}"
6360
# Note pthread may not be found thus invoke creation will fail to be created.
6461
# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
6562
# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
6663

67-
$gcc_cmd -DLINUX ${CFLAGS} -o invoke \
64+
$gcc_cmd -DLINUX ${CFLAGBITS} -o invoke \
6865
-I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
6966
-L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
7067
-ljvm -lpthread invoke.cxx

Diff for: hotspot/test/runtime/StackGap/testme.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ if [ "x$gcc_cmd" = "x" ]; then
4949
exit 0;
5050
fi
5151

52-
if [ "x${VM_CPU}" != "xaarch64" ];
53-
then
54-
CFLAGS="-m${VM_BITS}"
55-
fi
56-
5752
LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
5853
export LD_LIBRARY_PATH
5954

@@ -62,12 +57,11 @@ cp ${TESTSRC}${FS}exestack-gap.c .
6257
# Copy the result of our @compile action:
6358
cp ${TESTCLASSES}${FS}T.class .
6459

65-
echo "Compilation flag: ${COMP_FLAG}"
6660
# Note pthread may not be found thus invoke creation will fail to be created.
6761
# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
6862
# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
6963

70-
$gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
64+
$gcc_cmd -DLINUX ${CFLAGBITS} -o stack-gap \
7165
-I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
7266
-L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
7367
exestack-gap.c \

Diff for: hotspot/test/runtime/jni/CallWithJNIWeak/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ THIS_DIR=.
6868
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
6969
${TESTJAVA}${FS}bin${FS}javac *.java
7070

71-
$cc_cmd -fPIC -shared -o libCallWithJNIWeak.so \
71+
$cc_cmd ${CFLAGBITS} -fPIC -shared -o libCallWithJNIWeak.so \
7272
-I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
7373
${TESTSRC}${FS}CallWithJNIWeak.c
7474

Diff for: hotspot/test/runtime/jni/ReturnJNIWeak/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ THIS_DIR=.
6868
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
6969
${TESTJAVA}${FS}bin${FS}javac *.java
7070

71-
$cc_cmd -fPIC -shared -o libReturnJNIWeak.so \
71+
$cc_cmd ${CFLAGBITS} -fPIC -shared -o libReturnJNIWeak.so \
7272
-I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
7373
${TESTSRC}${FS}ReturnJNIWeak.c
7474

Diff for: hotspot/test/runtime/jsig/Test8017498.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ THIS_DIR=.
7070
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
7171
${TESTJAVA}${FS}bin${FS}javac *.java
7272

73-
$gcc_cmd -DLINUX -fPIC -shared \
73+
$gcc_cmd -DLINUX ${CFLAGBITS} -fPIC -shared \
7474
-o ${TESTSRC}${FS}libTestJNI.so \
7575
-I${TESTJAVA}${FS}include \
7676
-I${TESTJAVA}${FS}include${FS}linux \

Diff for: hotspot/test/test_env.sh

+6
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,23 @@ then
157157
fi
158158

159159
VM_CPU="unknown"
160+
CFLAGBITS=""
160161
grep "sparc" vm_version.out > ${NULL}
161162
if [ $? = 0 ]
162163
then
163164
VM_CPU="sparc"
164165
if [ $VM_BITS = "64" ]
165166
then
166167
VM_CPU="sparcv9"
168+
else
169+
CFLAGBITS="-m32"
167170
fi
168171
fi
169172
grep "x86" vm_version.out > ${NULL}
170173
if [ $? = 0 ]
171174
then
172175
VM_CPU="i386"
176+
CFLAGBITS="-m32"
173177
fi
174178
grep "amd64" vm_version.out > ${NULL}
175179
if [ $? = 0 ]
@@ -193,6 +197,8 @@ then
193197
then
194198
VM_CPU="ppc64le"
195199
fi
200+
else
201+
CFLAGBITS="-m32"
196202
fi
197203
fi
198204
grep "ia64" vm_version.out > ${NULL}

0 commit comments

Comments
 (0)