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

Open XL segfault fix and workaround for si.cpp macro collision #7323

Merged
merged 1 commit into from
May 1, 2024

Conversation

Deigue
Copy link
Contributor

@Deigue Deigue commented Apr 25, 2024

The omrthread_get_ras_tid() function in rasthrsup.c was causing a segmentation fault with Open XL as pthread_t is structured in a different manner. This fixes that while keeping support with XLC. The header grp.h used in si.cpp also has a macro collision with the native locale header from Open XL. The reordering of headers is a workaround for the core problem. A issue has also been created in order to use a better macro name __grp.

(This is one part of the multiple changes added for supporting Open XL compilation on OMR)

fvtest/porttest/si.cpp Outdated Show resolved Hide resolved
The omrthread_get_ras_tid() function in rasthrsup.c was causing
a segmentation fault with Open XL as pthread_t is structured in a
different manner. This fixes that while keeping support with XLC.
The header grp.h used in si.cpp also has a macro collision with the
native locale header from Open XL. The reordering of headers is a
workaround for the core problem. A issue has also been created in
order to use a better macro name __grp.
@babsingh
Copy link
Contributor

jenkins build all

Copy link
Contributor

@babsingh babsingh left a comment

Choose a reason for hiding this comment

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

LGTM. The z/OS build has passed. @keithc-ca Do the changes look good to you?

@babsingh
Copy link
Contributor

babsingh commented May 1, 2024

Only unrelated failures are seen:

@babsingh babsingh merged commit acd6f7e into eclipse-omr:master May 1, 2024
15 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants