Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
libnative: fix epoll_event struct layout
Make the definition of epoll_event use natural alignment on all architectures except x86_64. Before this commit, the struct was always 12 bytes big, which works okay on x86 and x86_64 but not on ARM and MIPS, where it should be 16 bytes big with the `data` field aligned on an 8 byte boundary.
- Loading branch information
1 parent
3e0eb3c
commit 6121acf
Showing
1 changed file
with
10 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6121acf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from brson
at https://github.com/bnoordhuis/rust/commit/6121acf97d94193a653acce7d9baf81c59d20eab
6121acf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging bnoordhuis/rust/sizeof-epoll-event-fixup = 6121acf into auto
6121acf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bnoordhuis/rust/sizeof-epoll-event-fixup = 6121acf merged ok, testing candidate = 62caad2
6121acf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3981
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1823
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1825
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3981
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3081
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3087
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3996
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3084
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3090
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3998
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3084
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3089
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3158
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/936
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3989
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3090
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3095
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3758
6121acf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 62caad2