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

Fix OMR_ENV_OPENXL Usage #20928

Merged
merged 1 commit into from
Feb 8, 2025
+11 −9
Merged

Fix OMR_ENV_OPENXL Usage #20928

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 2 deletions runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk
View file
Original file line number Diff line number Diff line change
@@ -76,11 +76,13 @@ CONFIGURE_ARGS += 'AR=$(AR)'
CONFIGURE_ARGS += 'OMR_HOST_OS=aix'
CONFIGURE_ARGS += 'OMR_HOST_ARCH=ppc'
CONFIGURE_ARGS += 'OMR_TARGET_DATASIZE=$(TEMP_TARGET_DATASIZE)'
CONFIGURE_ARGS += 'OMR_TOOLCHAIN=xlc'
ifeq ($(OMR_ENV_OPENXL),1)

ifneq (,$(findstring ibm-clang,$(notdir $(CC))))
CONFIGURE_ARGS += 'OMR_TOOLCHAIN=openxl'
CONFIGURE_ARGS += 'GLOBAL_CFLAGS=-fstack-protector'
CONFIGURE_ARGS += 'GLOBAL_CXXFLAGS=-fstack-protector'
else
CONFIGURE_ARGS += 'OMR_TOOLCHAIN=xlc'
CONFIGURE_ARGS += 'GLOBAL_CFLAGS=-qstackprotect'
CONFIGURE_ARGS += 'GLOBAL_CXXFLAGS=-qstackprotect'
endif
14 changes: 7 additions & 7 deletions runtime/makelib/targets.mk.aix.inc.ftl
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ endif
ifeq ($(j9vm_env_data64),1)
UMA_ASPP_DEBUG += -g
UMA_LIB_LINKER_FLAGS += -X64
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
UMA_CC_MODE += -m64
else
UMA_CC_MODE += -q64
@@ -102,7 +102,7 @@ else
endif

ifeq (,$(findstring xlclang,$(notdir $(CC))))
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
# for openxl do nothing
else
# xlc options
@@ -112,7 +112,7 @@ else
# xlclang options
CFLAGS += -qxlcompatmacros
endif
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
#openxl options
CFLAGS += -std=c89 -qarch=ppc -fno-strict-aliasing -fstack-protector
else
@@ -127,7 +127,7 @@ else
endif

ifeq (,$(findstring xlclang++,$(notdir $(CXX))))
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
# openxl options
CXXFLAGS += -fno-rtti -fno-exceptions
else
@@ -138,7 +138,7 @@ else
# xlclang++ options
CXXFLAGS += -qxlcompatmacros -fno-rtti -fno-exceptions
endif
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
# openxl options
CXXFLAGS += -std=c++11 -qarch=ppc -fno-strict-aliasing -fstack-protector
else
@@ -166,7 +166,7 @@ endif
UMA_SYS_LINK_PATH := -L/usr/lib/threads

ifeq ($(j9vm_env_data64),1)
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
UMA_DLL_LINK_FLAGS += -m64
else
UMA_DLL_LINK_FLAGS += -q64
@@ -205,7 +205,7 @@ $(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))) : %$(UMA_DOT_O) : %

ifdef UMA_TREAT_WARNINGS_AS_ERRORS
ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS
ifeq ($(OMR_ENV_OPENXL),1)
ifeq (openxl,$(OMR_TOOLCHAIN))
CFLAGS += -Werror
CXXFLAGS += -Werror
else