Skip to content

Commit c5e2e67

Browse files
committed
Make fpreg_t an union
1 parent 22623e1 commit c5e2e67

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

libc-test/build.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4806,8 +4806,6 @@ fn test_linux(target: &str) {
48064806
cfg.skip_roundtrip(move |s| match s {
48074807
// FIXME(1.0):
48084808
"mcontext_t" if s390x => true,
4809-
// FIXME(union): This is actually a union.
4810-
"fpreg_t" if s390x => true,
48114809

48124810
// The test doesn't work on some env:
48134811
"ipv6_mreq"

src/unix/linux_like/linux/gnu/b64/s390x.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,27 +212,25 @@ s! {
212212
}
213213

214214
s_no_extra_traits! {
215-
// FIXME(union): This is actually a union.
216-
pub struct fpreg_t {
215+
pub union fpreg_t {
217216
pub d: c_double,
218-
// f: c_float,
217+
pub f: c_float,
219218
}
220219
}
221220

222221
cfg_if! {
223222
if #[cfg(feature = "extra_traits")] {
224223
impl PartialEq for fpreg_t {
225-
fn eq(&self, other: &fpreg_t) -> bool {
226-
self.d == other.d
224+
fn eq(&self, _other: &fpreg_t) -> bool {
225+
unimplemented!("traits")
227226
}
228227
}
229228

230229
impl Eq for fpreg_t {}
231230

232231
impl hash::Hash for fpreg_t {
233-
fn hash<H: hash::Hasher>(&self, state: &mut H) {
234-
let d: u64 = self.d.to_bits();
235-
d.hash(state);
232+
fn hash<H: hash::Hasher>(&self, _state: &mut H) {
233+
unimplemented!("traits")
236234
}
237235
}
238236
}

0 commit comments

Comments
 (0)