Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy files to JDK explicitly #210

Merged
merged 3 commits into from
Dec 5, 2018
Merged

Copy files to JDK explicitly #210

merged 3 commits into from
Dec 5, 2018

Conversation

keithc-ca
Copy link
Member

@keithc-ca keithc-ca commented Nov 16, 2018

Explicitly copy files to images like was done in ibmruntimes/openj9-openjdk-jdk11#16.

  • Copy the redirector library to lib/server as expected by openjdk.
  • Other shared libraries link to the redirector libjvm.so: it must be present in the lib/server directory which is included in the library search path. The library in the vm directory is the real VM, not a redirector. The adjustments to LDFLAGS_JDKLIB in custom-hook.m4 weren't correct and are no longer helpful.
  • Also remove unnecessary use of () for scripts.

The effect of this change is to add this file:

+ images/j2sdk-image/jre/lib/amd64/server/libjvm.so

and omit these (which can be found in images/test/openj9):

- images/j2sdk-image/jre/lib/amd64/compressedrefs/libballoon29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libbcuwhite.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libbcvwhite.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libgdb_j929.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libgptest.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libhooktests.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9ben.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9ddr_misc29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9lazyClassLoad.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9thrnumanatives29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9thrtestnatives29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9unresolved.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libj9vmtest.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libjcoregen29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libjlmagent29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libjniargtests.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libjvmtitest.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libmemorywatcher29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libmigration.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libosmemory29.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libSharedClassesNativeAgent.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libsoftmxtest.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libtestjvmtiA.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libtestjvmtiB.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libtestlibA.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libtestlibB.so
- images/j2sdk-image/jre/lib/amd64/compressedrefs/libvmruntimestateagent29.so

Fixes #17
Fixes eclipse-openj9/openj9#805

@pshipton
Copy link
Member

jenkins test sanity zlinux

@pshipton
Copy link
Member

jenkins test all xlinux,plinux,win,aix

@pshipton
Copy link
Member

jenkins test extended zlinux

@pshipton
Copy link
Member

@llxia @sophia-guo please see the extended test AttachAPI failures. Seems we are not quite ready to remove the test libraries from the jdk8 builds.

@sophia-guo
Copy link

Yes, for JDK8 when enable native tests only executables related Variables are updated. Shared libraries related variables are keep the same. I will update that.

@llxia
Copy link

llxia commented Nov 21, 2018

jenkins test extended zlinux jdk8

@llxia
Copy link

llxia commented Nov 21, 2018

@sophia-guo 's change is in.
Relaunched PR build failed at compilation. @keithc-ca Could you please rebase your branch?
https://ci.eclipse.org/openj9/job/PullRequest-Extended-JDK8-linux_390-64_cmprssptrs-OpenJDK8/8/console

@pshipton
Copy link
Member

pshipton commented Dec 3, 2018

@keithc-ca reminder this needs to be rebased.

Other shared libraries link to the redirector libjvm.so: it must be
present in the lib/server directory which is included in the library
search path. The library in the vm directory is the real VM, not a
redirector. The adjustments to LDFLAGS_JDKLIB in custom-hook.m4
weren't correct and are no longer helpful.

Also remove unnecessary use of () for scripts.

Signed-off-by: Keith W. Campbell <[email protected]>
Signed-off-by: Keith W. Campbell <[email protected]>
Signed-off-by: Keith W. Campbell <[email protected]>
@keithc-ca
Copy link
Member Author

keithc-ca commented Dec 4, 2018

I rebased, but I'm not sure it was really necessary. The failure I see in https://ci.eclipse.org/openj9/job/PullRequest-Extended-JDK8-linux_390-64_cmprssptrs-OpenJDK8/8/console seems to have nothing to do with this:

00:04:04.855 safeseh.s:1: Error: unknown pseudo-op: `.intel_syntax'

The copyright failures seem to be because the check doesn't look far enough into the (generated) files.

@keithc-ca
Copy link
Member Author

Jenkins test all aix,plinux,win,xlinux

@pshipton
Copy link
Member

pshipton commented Dec 4, 2018

jenkins test extended win

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants