Skip to content

[android] Adapt test to upstream readobj output change. #33382

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

Merged

Conversation

drodriguez
Copy link
Contributor

This is a change that will be necessary for master-next. readobj seems
to report elf32-littlearm when compiling for Android ARMv7.

This is similar to commit f7cf5bd which
is still available in master-next, but I think was (mistakenly) reverted
with #32265.

This is a change that will be necessary for master-next. readobj seems
to report elf32-littlearm when compiling for Android ARMv7.

This is similar to commit f7cf5bd which
is still available in master-next, but I think was (mistakenly) reverted
with swiftlang#32265.
@compnerd
Copy link
Member

@drodriguez - #32265 is a merge from tensorflow-stage to tensorflow, it doesn't make it on to master, I think it might be another commit that accidentally removed it?

@compnerd
Copy link
Member

@swift-ci please smoke test

@adrian-prantl
Copy link
Contributor

Can you also cherry-pick this to master-next and master-rebranch?

@drodriguez
Copy link
Contributor Author

@drodriguez - #32265 is a merge from tensorflow-stage to tensorflow, it doesn't make it on to master, I think it might be another commit that accidentally removed it?

Sorry for the confusion. The specific commit that seems to modify it in master is 68351d2#diff-171aac7a81fe9fa36089f1518b088dee, which Github associates with that PR.

Can you also cherry-pick this to master-next and master-rebranch?

I will. I was under the impression that this branch was periodically merged there, but I will create new PRs for those branches as soon as I can.

@drodriguez drodriguez merged commit 893c6b2 into swiftlang:master Aug 11, 2020
@drodriguez drodriguez deleted the android-32-readobj-format-change branch August 17, 2020 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants