File tree 8 files changed +13
-16
lines changed
compiler/criticalnatives/argumentcorruption
8 files changed +13
-16
lines changed Original file line number Diff line number Diff line change @@ -73,7 +73,7 @@ THIS_DIR=.
73
73
cp ${TESTSRC}${FS} * .java ${THIS_DIR}
74
74
${TESTJAVA}${FS} bin${FS} javac * .java
75
75
76
- $cc_cmd -fPIC -shared -o libCNCheckLongArgs.so \
76
+ $cc_cmd ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \
77
77
-I${TESTJAVA}${FS} include -I${TESTJAVA}${FS} include${FS} linux \
78
78
${TESTSRC}${FS} libCNCheckLongArgs.c
79
79
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ THIS_DIR=.
65
65
cp ${TESTSRC}${FS} * .java ${THIS_DIR}
66
66
${TESTJAVA}${FS} bin${FS} javac * .java
67
67
68
- $gcc_cmd -fPIC -shared -c -o test.o \
68
+ $gcc_cmd ${CFLAGBITS} -fPIC -shared -c -o test.o \
69
69
-I${TESTJAVA}${FS} include -I${TESTJAVA}${FS} include${FS} linux \
70
70
${TESTSRC}${FS} test.c
71
71
Original file line number Diff line number Diff line change @@ -49,8 +49,6 @@ if [ "x$gcc_cmd" = "x" ]; then
49
49
exit 0;
50
50
fi
51
51
52
- CFLAGS=" -m${VM_BITS} "
53
-
54
52
LD_LIBRARY_PATH=.:${COMPILEJAVA} /jre/lib/${VM_CPU} /${VM_TYPE} :/usr/lib:$LD_LIBRARY_PATH
55
53
export LD_LIBRARY_PATH
56
54
@@ -59,12 +57,11 @@ cp ${TESTSRC}${FS}invoke.cxx .
59
57
# Copy the result of our @compile action:
60
58
cp ${TESTCLASSES}${FS} DoOverflow.class .
61
59
62
- echo " Compilation flag: ${COMP_FLAG} "
63
60
# Note pthread may not be found thus invoke creation will fail to be created.
64
61
# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
65
62
# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
66
63
67
- $gcc_cmd -DLINUX ${CFLAGS } -o invoke \
64
+ $gcc_cmd -DLINUX ${CFLAGBITS } -o invoke \
68
65
-I${COMPILEJAVA} /include -I${COMPILEJAVA} /include/linux \
69
66
-L${COMPILEJAVA} /jre/lib/${VM_CPU} /${VM_TYPE} \
70
67
-ljvm -lpthread invoke.cxx
Original file line number Diff line number Diff line change @@ -49,11 +49,6 @@ if [ "x$gcc_cmd" = "x" ]; then
49
49
exit 0;
50
50
fi
51
51
52
- if [ " x${VM_CPU} " != " xaarch64" ];
53
- then
54
- CFLAGS=" -m${VM_BITS} "
55
- fi
56
-
57
52
LD_LIBRARY_PATH=.:${COMPILEJAVA} /jre/lib/${VM_CPU} /${VM_TYPE} :/usr/lib:$LD_LIBRARY_PATH
58
53
export LD_LIBRARY_PATH
59
54
@@ -62,12 +57,11 @@ cp ${TESTSRC}${FS}exestack-gap.c .
62
57
# Copy the result of our @compile action:
63
58
cp ${TESTCLASSES}${FS} T.class .
64
59
65
- echo " Compilation flag: ${COMP_FLAG} "
66
60
# Note pthread may not be found thus invoke creation will fail to be created.
67
61
# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
68
62
# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
69
63
70
- $gcc_cmd -DLINUX ${CFLAGS } -o stack-gap \
64
+ $gcc_cmd -DLINUX ${CFLAGBITS } -o stack-gap \
71
65
-I${COMPILEJAVA} /include -I${COMPILEJAVA} /include/linux \
72
66
-L${COMPILEJAVA} /jre/lib/${VM_CPU} /${VM_TYPE} \
73
67
exestack-gap.c \
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ THIS_DIR=.
68
68
cp ${TESTSRC}${FS} * .java ${THIS_DIR}
69
69
${TESTJAVA}${FS} bin${FS} javac * .java
70
70
71
- $cc_cmd -fPIC -shared -o libCallWithJNIWeak.so \
71
+ $cc_cmd ${CFLAGBITS} -fPIC -shared -o libCallWithJNIWeak.so \
72
72
-I${TESTJAVA}${FS} include -I${TESTJAVA}${FS} include${FS} linux \
73
73
${TESTSRC}${FS} CallWithJNIWeak.c
74
74
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ THIS_DIR=.
68
68
cp ${TESTSRC}${FS} * .java ${THIS_DIR}
69
69
${TESTJAVA}${FS} bin${FS} javac * .java
70
70
71
- $cc_cmd -fPIC -shared -o libReturnJNIWeak.so \
71
+ $cc_cmd ${CFLAGBITS} -fPIC -shared -o libReturnJNIWeak.so \
72
72
-I${TESTJAVA}${FS} include -I${TESTJAVA}${FS} include${FS} linux \
73
73
${TESTSRC}${FS} ReturnJNIWeak.c
74
74
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ THIS_DIR=.
70
70
cp ${TESTSRC}${FS} * .java ${THIS_DIR}
71
71
${TESTJAVA}${FS} bin${FS} javac * .java
72
72
73
- $gcc_cmd -DLINUX -fPIC -shared \
73
+ $gcc_cmd -DLINUX ${CFLAGBITS} -fPIC -shared \
74
74
-o ${TESTSRC}${FS} libTestJNI.so \
75
75
-I${TESTJAVA}${FS} include \
76
76
-I${TESTJAVA}${FS} include${FS} linux \
Original file line number Diff line number Diff line change @@ -157,19 +157,23 @@ then
157
157
fi
158
158
159
159
VM_CPU=" unknown"
160
+ CFLAGBITS=" "
160
161
grep " sparc" vm_version.out > ${NULL}
161
162
if [ $? = 0 ]
162
163
then
163
164
VM_CPU=" sparc"
164
165
if [ $VM_BITS = " 64" ]
165
166
then
166
167
VM_CPU=" sparcv9"
168
+ else
169
+ CFLAGBITS=" -m32"
167
170
fi
168
171
fi
169
172
grep " x86" vm_version.out > ${NULL}
170
173
if [ $? = 0 ]
171
174
then
172
175
VM_CPU=" i386"
176
+ CFLAGBITS=" -m32"
173
177
fi
174
178
grep " amd64" vm_version.out > ${NULL}
175
179
if [ $? = 0 ]
193
197
then
194
198
VM_CPU=" ppc64le"
195
199
fi
200
+ else
201
+ CFLAGBITS=" -m32"
196
202
fi
197
203
fi
198
204
grep " ia64" vm_version.out > ${NULL}
You can’t perform that action at this time.
0 commit comments