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

Fix QNX 7.0 support #8593 #8637

Merged
merged 5 commits into from
Jun 4, 2021
Merged

Conversation

dschopf
Copy link
Contributor

@dschopf dschopf commented May 21, 2021

These changes resolve all issues described in #8593 except for the linker issue.

@google-cla
Copy link

google-cla bot commented May 21, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no label May 21, 2021
@dschopf
Copy link
Contributor Author

dschopf commented May 21, 2021

@googlebot I signed it!

@google-cla google-cla bot added cla: yes and removed cla: no labels May 21, 2021
@fowles fowles requested review from fowles and jtattermusch May 21, 2021 14:35
@fowles
Copy link
Contributor

fowles commented May 21, 2021

Looks mostly good, but I would like to have Jan take a look because of the aarch64 change in src/google/protobuf/stubs/platform_macros.h

@pablorcum
Copy link

@dschopf Please include the missing labels release notes: yes and c++ to enable merging.

@dschopf
Copy link
Contributor Author

dschopf commented Jun 4, 2021

Sorry, I can't do that, looks like I don't have permission to add or edit labels.

Copy link
Contributor

@jtattermusch jtattermusch left a comment

Choose a reason for hiding this comment

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

I don't have any experience with QNX, but the change in platform_macros.h seems fair
(and it only kicks in when __QNX__ is defined, so I don't think it can break the aarch64 linux support in any way).
I'll let @fowles to review the rest of the code and give the final approval.

@fowles fowles merged commit 8d8ba6a into protocolbuffers:master Jun 4, 2021
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
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.

5 participants