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.

Sign up for GitHub

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

Jump to bottom

Properly link omrsig and enable OMRPORT_OMRSIG_SUPPORT globally #2631

Merged
merged 5 commits into from
Sep 14, 2018
Merged

Properly link omrsig and enable OMRPORT_OMRSIG_SUPPORT globally #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe191c
Properly link omrsig when building constgen and j9ddrgen
babsingh Aug 14, 2018
11c7267
Remove OMRPORT_OMRSIG_SUPPORT definitions
babsingh Aug 14, 2018
45135e8
Enable OMRPORT_OMRSIG_SUPPORT globally in OpenJ9
babsingh Aug 14, 2018
2311b33
Fix indentation in hyvm/module.xml
babsingh Aug 27, 2018
31f655c
Link omrsig to port and vm only if J9VM_PORT_OMRSIG_SUPPORT is enabled
babsingh Aug 27, 2018
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
2 changes: 1 addition & 1 deletion runtime/ddr/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<library name="j9ddrautoblob"/>
<library name="j9gcautoblob"/>
<library name="omrsig">
<include-if condition="spec.linux_ztpf.*"/>
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
</library>

<!-- The following libs are needed to statically link the port library. -->
Expand Down
3 changes: 3 additions & 0 deletions runtime/gc_glue_java/configure_includes/configure_common.mk.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ TEMP_TARGET_DATASIZE := $(if $(findstring -64,$(SPEC)),64,32)
CONFIGURE_ARGS += \
<#if uma.spec.flags.opt_cuda.enabled>
--enable-OMR_OPT_CUDA \
</#if>
<#if uma.spec.flags.port_omrsigSupport.enabled>
--enable-OMRPORT_OMRSIG_SUPPORT \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this enable OMRPORT_OMRSIG_SUPPORT in OpenJ9 code? i.e. where does the flag get defined?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the flag will be defined in omrcfg.h.

</#if>
--enable-OMR_GC \
--enable-OMR_PORT \
Expand Down
4 changes: 2 additions & 2 deletions runtime/hyvm/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</objects>
<libraries>
<library name="omrsig">
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
</library>
<library name="socket" type="macro"/>
<library name="j9exelib"/>
Expand All @@ -81,7 +81,7 @@
<library name="hyprtshim"/>
<!-- for advance toolchain pthread must be last in the link order -->
<library name="pthread" type="system">
<include-if condition="spec.linux.* and not spec.linux_ztpf.*"/>
<include-if condition="spec.linux.* and not spec.linux_ztpf.*"/>
</library>
</libraries>
</artifact>
Expand Down
2 changes: 1 addition & 1 deletion runtime/jilgen/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<library name="j9exelib"/>
<library name="j9utilcore"/>
<library name="omrsig">
<include-if condition="spec.linux_ztpf.*"/>
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
</library>

<!-- The following libs are needed to statically link the port library -->
Expand Down
8 changes: 3 additions & 5 deletions runtime/port/j9omrport/j9omrport.mk.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#
# Copyright (c) 2012, 2017 IBM Corp. and others
###############################################################################
# Copyright (c) 2012, 2018 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand All @@ -19,7 +18,7 @@
# [2] http://openjdk.java.net/legal/assembly-exception.html
#
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
#
###############################################################################

# This makefile is generated using an UMA template.

Expand All @@ -38,7 +37,6 @@ MODULE_NAME := j9omrport
ARTIFACT_TYPE := archive

<#if uma.spec.flags.port_omrsigSupport.enabled>
MODULE_CPPFLAGS += -DOMRPORT_OMRSIG_SUPPORT
MODULE_INCLUDES += $(UMA_PATH_TO_ROOT)include
MODULE_SHARED_LIBS += omrsig
</#if>
Expand Down
7 changes: 3 additions & 4 deletions runtime/port/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@

<flags>
<flag name="J9PORT_LIBRARY_DEFINE"/>
<flag name="OMRPORT_OMRSIG_SUPPORT">
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
</flag>
<group name="vendor_flags"/>
</flags>

Expand Down Expand Up @@ -352,7 +349,9 @@
<library name="j9utilcore"/>
<library name="j9avl" type="external"/>
<library name="j9hashtable" type="external"/>
<library name="omrsig"/>
<library name="omrsig">
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
</library>
<library name="socket" type="macro"/>
<library name="j9pool" type="external"/>
<library name="omrglue" type="external"/>
Expand Down
4 changes: 3 additions & 1 deletion runtime/vm/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<library name="j9hookable"/>
<library name="j9omr" type="external"/>
<library name="j9prt"/>
<library name="omrsig"/>
<library name="omrsig">
<include-if condition="spec.flags.J9VM_PORT_OMRSIG_SUPPORT"/>
</library>
<library name="j9bcv"/>
<library name="j9dyn"/>
<library name="j9simplepool"/>
Expand Down