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

Remove Java_com_ibm_jit_crypto_* from jithelpers uma object #255

Merged
merged 1 commit into from
Oct 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion runtime/jcl/cl_se7_basic/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
<xi:include href="../uma/se8_exports.xml"></xi:include>
<xi:include href="../uma/se829_exports.xml"></xi:include>
<xi:include href="../uma/se8only_exports.xml"></xi:include>


<xi:include href="../uma/vendor_jcl_exports.xml">
<xi:fallback/>
</xi:include>

<xi:include href="../uma/sun_misc_Unsafe_objects.xml"></xi:include>
<xi:include href="../uma/se6_vm-side_natives_objects.xml"></xi:include>
<xi:include href="../uma/se6_vm-side_lifecycle_objects.xml"></xi:include>
Expand Down
6 changes: 5 additions & 1 deletion runtime/jcl/cl_se9/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
<xi:include href="../uma/se8_exports.xml"></xi:include>
<xi:include href="../uma/se829_exports.xml"></xi:include>
<xi:include href="../uma/se9_exports.xml"></xi:include>


<xi:include href="../uma/vendor_jcl_exports.xml">
<xi:fallback/>
</xi:include>

<xi:include href="../uma/sun_misc_Unsafe_objects.xml"></xi:include>
<xi:include href="../uma/se6_vm-side_natives_objects.xml"></xi:include>
<xi:include href="../uma/se6_vm-side_lifecycle_objects.xml"></xi:include>
Expand Down
6 changes: 5 additions & 1 deletion runtime/jcl/cl_se9_before_b165/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
<xi:include href="../uma/se8_exports.xml"></xi:include>
<xi:include href="../uma/se829_exports.xml"></xi:include>
<xi:include href="../uma/se9_exports.xml"></xi:include>


<xi:include href="../uma/vendor_jcl_exports.xml">
<xi:fallback/>
</xi:include>

<xi:include href="../uma/sun_misc_Unsafe_objects.xml"></xi:include>
<xi:include href="../uma/se6_vm-side_natives_objects.xml"></xi:include>
<xi:include href="../uma/se6_vm-side_lifecycle_objects.xml"></xi:include>
Expand Down
28 changes: 0 additions & 28 deletions runtime/jcl/uma/jithelpers_jni_exports.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,6 @@
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-->
<exports group="jithelpers">
<export name="Java_com_ibm_jit_crypto_JITAESCryptInHardware_isAESSupportedByHardwareImpl" />
<export name="Java_com_ibm_jit_crypto_JITAESCryptInHardware_expandAESKeyInHardware" />
<export name="Java_com_ibm_jit_crypto_JITAESCryptInHardware_doAESInHardware" />

<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_z_1kimd_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_z_1kimd_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_z_1klmd_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_z_1klmd_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_getCryptoHardwareFeatures" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_sha256" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_sha512" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1km_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1km_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_z_1kmac_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareDigest_z_1kmac_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmc_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmc_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmctr_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmctr_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmgcm_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmgcm_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmf_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmf_1supported" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmo_1native" />
<export name="Java_com_ibm_jit_crypto_JITFullHardwareCrypt_z_1kmo_1supported" />
<export name="Java_com_ibm_jit_crypto_JITTRNGInHardware_isTRNGSupportedByHardwareImpl" />
<export name="Java_com_ibm_jit_crypto_JITTRNGInHardware_randomImpl" />

<export name="Java_com_ibm_jit_JITHelpers_javaLangClassJ9ClassOffset" />
<export name="Java_com_ibm_jit_JITHelpers_j9ObjectJ9ClassOffset" />
<export name="Java_com_ibm_jit_JITHelpers_objectHeaderHasBeenMovedInClass" />
Expand Down
4 changes: 4 additions & 0 deletions sourcetools/com.ibm.uma/com/ibm/uma/om/Exports.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public void addExport(Export export) {
exports.add(export);
}

public void addExports(Exports exps) {
exports.addAll(exps.getExports());
}

public Vector<Export> getExports() {
return exports;
}
Expand Down
6 changes: 5 additions & 1 deletion sourcetools/com.ibm.uma/com/ibm/uma/om/Module.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ public void addArtifact(Artifact artifact) throws UMAException {
}

public void addExports(String group, Exports exps) {
exports.put(group, exps);
if ( exports.containsKey(group) ) {
exports.get(group).addExports(exps);
} else {
exports.put(group, exps);
}
}

public void addObjects(String group, Objects objs) {
Expand Down