8296959: Fix hotspot shell tests of 8u on multilib systems

Reviewed-by: sgehwolf

Author: zzambers

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

@@ -73,7 +73,7 @@ THIS_DIR=.
 cp ${TESTSRC}${FS}*.java ${THIS_DIR}
 ${TESTJAVA}${FS}bin${FS}javac *.java
 
-$cc_cmd -fPIC -shared -o libCNCheckLongArgs.so \
+$cc_cmd ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \
     -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
     ${TESTSRC}${FS}libCNCheckLongArgs.c
 

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

@@ -65,7 +65,7 @@ THIS_DIR=.
 cp ${TESTSRC}${FS}*.java ${THIS_DIR}
 ${TESTJAVA}${FS}bin${FS}javac *.java
 
-$gcc_cmd -fPIC -shared -c -o test.o \
+$gcc_cmd ${CFLAGBITS} -fPIC -shared -c -o test.o \
     -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
     ${TESTSRC}${FS}test.c
 

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

@@ -49,8 +49,6 @@ if [ "x$gcc_cmd" = "x" ]; then
     exit 0;
 fi
 
-CFLAGS="-m${VM_BITS}"
-
 LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 
@@ -59,12 +57,11 @@ cp ${TESTSRC}${FS}invoke.cxx .
 # Copy the result of our @compile action:
 cp ${TESTCLASSES}${FS}DoOverflow.class .
 
-echo "Compilation flag: ${COMP_FLAG}"
 # Note pthread may not be found thus invoke creation will fail to be created.
 # Check to ensure you have a /usr/lib/libpthread.so if you don't please look
 # for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
 
-$gcc_cmd -DLINUX ${CFLAGS} -o invoke \
+$gcc_cmd -DLINUX ${CFLAGBITS} -o invoke \
     -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
     -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
     -ljvm -lpthread invoke.cxx

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

@@ -49,11 +49,6 @@ if [ "x$gcc_cmd" = "x" ]; then
     exit 0;
 fi
 
-if [ "x${VM_CPU}" != "xaarch64" ];
-then
-    CFLAGS="-m${VM_BITS}"
-fi
-
 LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 
@@ -62,12 +57,11 @@ cp ${TESTSRC}${FS}exestack-gap.c .
 # Copy the result of our @compile action:
 cp ${TESTCLASSES}${FS}T.class .
 
-echo "Compilation flag: ${COMP_FLAG}"
 # Note pthread may not be found thus invoke creation will fail to be created.
 # Check to ensure you have a /usr/lib/libpthread.so if you don't please look
 # for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
 
-$gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
+$gcc_cmd -DLINUX ${CFLAGBITS} -o stack-gap \
     -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
     -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
     exestack-gap.c \

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

@@ -68,7 +68,7 @@ THIS_DIR=.
 cp ${TESTSRC}${FS}*.java ${THIS_DIR}
 ${TESTJAVA}${FS}bin${FS}javac *.java
 
-$cc_cmd -fPIC -shared -o libCallWithJNIWeak.so \
+$cc_cmd ${CFLAGBITS} -fPIC -shared -o libCallWithJNIWeak.so \
     -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
     ${TESTSRC}${FS}CallWithJNIWeak.c
 

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

@@ -68,7 +68,7 @@ THIS_DIR=.
 cp ${TESTSRC}${FS}*.java ${THIS_DIR}
 ${TESTJAVA}${FS}bin${FS}javac *.java
 
-$cc_cmd -fPIC -shared -o libReturnJNIWeak.so \
+$cc_cmd ${CFLAGBITS} -fPIC -shared -o libReturnJNIWeak.so \
     -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
     ${TESTSRC}${FS}ReturnJNIWeak.c
 

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

@@ -70,7 +70,7 @@ THIS_DIR=.
 cp ${TESTSRC}${FS}*.java ${THIS_DIR}
 ${TESTJAVA}${FS}bin${FS}javac *.java
 
-$gcc_cmd -DLINUX -fPIC -shared \
+$gcc_cmd -DLINUX ${CFLAGBITS} -fPIC -shared \
     -o ${TESTSRC}${FS}libTestJNI.so \
     -I${TESTJAVA}${FS}include \
     -I${TESTJAVA}${FS}include${FS}linux \

Diff for: hotspot/test/test_env.sh

@@ -157,19 +157,23 @@ then
 fi
 
 VM_CPU="unknown"
+CFLAGBITS=""
 grep "sparc" vm_version.out > ${NULL}
 if [ $? = 0 ]
 then
   VM_CPU="sparc"
   if [ $VM_BITS = "64" ]
   then
     VM_CPU="sparcv9"
+  else
+    CFLAGBITS="-m32"
   fi
 fi
 grep "x86" vm_version.out > ${NULL}
 if [ $? = 0 ]
 then
   VM_CPU="i386"
+  CFLAGBITS="-m32"
 fi
 grep "amd64" vm_version.out > ${NULL}
 if [ $? = 0 ]
@@ -193,6 +197,8 @@ then
     then
       VM_CPU="ppc64le"
     fi
+  else
+    CFLAGBITS="-m32"
   fi
 fi
 grep "ia64" vm_version.out > ${NULL}