Skip to content
Snippets Groups Projects
Commit 0505ea4f authored by Avi Kivity's avatar Avi Kivity
Browse files

bootfs: add a few more files

Change the directory structure a little to conform with jvm expecations
(removing server/ from libjvm.so).
parent bde5af4f
No related branches found
No related tags found
No related merge requests found
[manifest] [manifest]
/usr/lib/libjvm.so: %(jdkbase)s/jre/lib/amd64/server/libjvm.so /usr/lib/jre/lib/server/libjvm.so: %(jdkbase)s/jre/lib/amd64/server/libjvm.so
/usr/lib/jre/lib/libverify.so: %(jdkbase)s/jre/lib/amd64/libverify.so
/usr/lib/jre/lib/libjava.so: %(jdkbase)s/jre/lib/amd64/libjava.so
/usr/lib/libstdc++.so.6: /usr/lib64/libstdc++.so.6 /usr/lib/libstdc++.so.6: /usr/lib64/libstdc++.so.6
/usr/lib/libm.so.6: /usr/lib64/libm.so.6 /usr/lib/libm.so.6: /usr/lib64/libm.so.6
/usr/lib/libgcc_s.so.1: /usr/lib64/libgcc_s.so.1 /usr/lib/libgcc_s.so.1: /usr/lib64/libgcc_s.so.1
...@@ -127,7 +127,7 @@ int main(int ac, char **av) ...@@ -127,7 +127,7 @@ int main(int ac, char **av)
bootfs fs; bootfs fs;
rootfs = &fs; rootfs = &fs;
fileref f = fs.open("/usr/lib/libjvm.so"); fileref f = fs.open("/usr/lib/jre/lib/server/libjvm.so");
char buf[100]; char buf[100];
f->read(buf, 0, 100); f->read(buf, 0, 100);
...@@ -164,7 +164,7 @@ int main(int ac, char **av) ...@@ -164,7 +164,7 @@ int main(int ac, char **av)
void main_thread(elf::program& prog) void main_thread(elf::program& prog)
{ {
test_threads(); test_threads();
prog.add("/usr/lib/libjvm.so"); prog.add("/usr/lib/jre/lib/server/libjvm.so");
auto JNI_GetDefaultJavaVMInitArgs auto JNI_GetDefaultJavaVMInitArgs
= prog.lookup_function<void (void*)>("JNI_GetDefaultJavaVMInitArgs"); = prog.lookup_function<void (void*)>("JNI_GetDefaultJavaVMInitArgs");
JavaVMInitArgs vm_args; JavaVMInitArgs vm_args;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment