Skip to content

Commit fbf7d5e

Browse files
BaoshanPangBaoshanPang
authored
Merge pull request #18 from rust-lang/master
Sync to rust-lang/libc master
2 parents 3ae217e + f6ed4e0 commit fbf7d5e

File tree

23 files changed

+294
-220
lines changed

23 files changed

+294
-220
lines changed

‎ci/build.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# Checks that libc builds properly for all supported targets on a particular
44
# Rust version:
5+
# The FILTER environment variable can be used to select which target(s) to build.
6+
# For example: set FILTER to vxworks to select the targets that has vxworks in name
57

68
set -ex
79

@@ -176,7 +178,9 @@ case "${OS}" in
176178
esac
177179

178180
for TARGET in $TARGETS; do
179-
test_target build "$TARGET"
181+
if echo "$TARGET"|grep -q "$FILTER";then
182+
test_target build "$TARGET"
183+
fi
180184
done
181185

182186
# FIXME: https://github.com/rust-lang/rust/issues/58564
@@ -237,7 +241,9 @@ powerpc64-wrs-vxworks \
237241

238242
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
239243
for TARGET in $RUST_LINUX_NO_CORE_TARGETS; do
240-
test_target xbuild "$TARGET" 1
244+
if echo "$TARGET"|grep -q "$FILTER";then
245+
test_target xbuild "$TARGET" 1
246+
fi
241247
done
242248

243249
# Nintendo switch

‎src/unix/bsd/apple/b32/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 2]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 2]
6+
}
7+
}

‎src/unix/bsd/apple/b64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 2]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 2]
6+
}
7+
}

‎src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 4]
6+
}
7+
}

‎src/unix/linux_like/android/b32/x86/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(8))]
3-
pub struct max_align_t([f64; 2]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(8))]
4+
pub struct max_align_t {
5+
priv_: [f64; 2]
6+
}
7+
}

‎src/unix/linux_like/android/b64/aarch64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f32; 8]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f32; 8]
6+
}
7+
}

‎src/unix/linux_like/android/b64/x86_64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 4]
6+
}
7+
}

‎src/unix/linux_like/emscripten/align.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
macro_rules! expand_align {
22
() => {
3-
#[derive(Copy, Clone, Debug, PartialEq)]
4-
#[repr(C, align(8))]
5-
pub struct max_align_t([f64; 2]);
6-
73
s! {
4+
#[allow(missing_debug_implementations)]
85
#[repr(align(4))]
96
pub struct pthread_mutex_t {
107
size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
@@ -39,6 +36,13 @@ macro_rules! expand_align {
3936
pub struct pthread_cond_t {
4037
size: [u8; ::__SIZEOF_PTHREAD_COND_T],
4138
}
39+
40+
#[allow(missing_debug_implementations)]
41+
#[repr(align(8))]
42+
pub struct max_align_t {
43+
priv_: [f64; 2]
44+
}
45+
4246
}
4347

4448
cfg_if! {

‎src/unix/linux_like/linux/gnu/b32/arm/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(8))]
3-
pub struct max_align_t([i64; 2]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(8))]
4+
pub struct max_align_t {
5+
priv_: [i64; 2]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b32/mips/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(8))]
3-
pub struct max_align_t([f32; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(8))]
4+
pub struct max_align_t {
5+
priv_: [f32; 4]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b32/x86/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 6]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 6]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b64/aarch64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f32; 8]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f32; 8]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b64/mips64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 4]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([i64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [i64; 4]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b64/sparc64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([i64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [i64; 4]
6+
}
7+
}

‎src/unix/linux_like/linux/gnu/b64/x86_64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 4]
6+
}
7+
}

‎src/unix/linux_like/linux/musl/b32/arm/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(8))]
3-
pub struct max_align_t(i64, i64);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(8))]
4+
pub struct max_align_t {
5+
priv_: (i64, i64)
6+
}
7+
}

‎src/unix/linux_like/linux/musl/b32/mips/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(8))]
3-
pub struct max_align_t([f32; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(8))]
4+
pub struct max_align_t {
5+
priv_: [f32; 4]
6+
}
7+
}

‎src/unix/linux_like/linux/musl/b32/x86/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(8))]
3-
pub struct max_align_t([f64; 3]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(8))]
4+
pub struct max_align_t {
5+
priv_: [f64; 3]
6+
}
7+
}

‎src/unix/linux_like/linux/musl/b64/aarch64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f32; 8]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f32; 8]
6+
}
7+
}

‎src/unix/linux_like/linux/musl/b64/x86_64/align.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
#[derive(Copy, Clone, Debug, PartialEq)]
2-
#[repr(C, align(16))]
3-
pub struct max_align_t([f64; 4]);
1+
s_no_extra_traits! {
2+
#[allow(missing_debug_implementations)]
3+
#[repr(align(16))]
4+
pub struct max_align_t {
5+
priv_: [f64; 4]
6+
}
7+
}

0 commit comments

Comments
 (0)