Skip to content

Commit

Permalink
Auto merge of #61393 - gnzlbg:update_libc, r=gnzlbg
Browse files Browse the repository at this point in the history
Update Cargo.lock
  • Loading branch information
bors committed Aug 2, 2019
2 parents 435236b + 52caca0 commit fc3ef96
Show file tree
Hide file tree
Showing 6 changed files with 167 additions and 77 deletions.
199 changes: 133 additions & 66 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/ci/docker/dist-various-1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi
ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf
ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl
ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu
ENV TARGETS=$TARGETS,x86_64-unknown-redox
# FIXME: temporarily disable the redox builder,
# see: https://github.com/rust-lang/rust/issues/63160
# ENV TARGETS=$TARGETS,x86_64-unknown-redox
ENV TARGETS=$TARGETS,thumbv6m-none-eabi
ENV TARGETS=$TARGETS,thumbv7m-none-eabi
ENV TARGETS=$TARGETS,thumbv7em-none-eabi
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_codegen_llvm/llvm/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ pub mod debuginfo {
bitflags! {
#[repr(transparent)]
#[derive(Default)]
pub struct DIFlags: ::libc::uint32_t {
pub struct DIFlags: u32 {
const FlagZero = 0;
const FlagPrivate = 1;
const FlagProtected = 2;
Expand Down Expand Up @@ -598,7 +598,7 @@ pub mod debuginfo {
bitflags! {
#[repr(transparent)]
#[derive(Default)]
pub struct DISPFlags: ::libc::uint32_t {
pub struct DISPFlags: u32 {
const SPFlagZero = 0;
const SPFlagVirtual = 1;
const SPFlagPureVirtual = 2;
Expand Down
25 changes: 21 additions & 4 deletions src/libstd/sys/unix/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,21 @@ mod inner {
t: Timespec::zero(),
};

#[repr(C)]
#[derive(Copy, Clone)]
struct mach_timebase_info {
numer: u32,
denom: u32,
}
type mach_timebase_info_t = *mut mach_timebase_info;
type kern_return_t = libc::c_int;

impl Instant {
pub fn now() -> Instant {
Instant { t: unsafe { libc::mach_absolute_time() } }
extern "C" {
fn mach_absolute_time() -> u64;
}
Instant { t: unsafe { mach_absolute_time() } }
}

pub const fn zero() -> Instant {
Expand Down Expand Up @@ -230,8 +242,8 @@ mod inner {
Some(mul_div_u64(nanos, info.denom as u64, info.numer as u64))
}

fn info() -> libc::mach_timebase_info {
static mut INFO: libc::mach_timebase_info = libc::mach_timebase_info {
fn info() -> mach_timebase_info {
static mut INFO: mach_timebase_info = mach_timebase_info {
numer: 0,
denom: 0,
};
Expand All @@ -245,7 +257,12 @@ mod inner {

// ... otherwise learn for ourselves ...
let mut info = mem::zeroed();
libc::mach_timebase_info(&mut info);
extern "C" {
fn mach_timebase_info(info: mach_timebase_info_t)
-> kern_return_t;
}

mach_timebase_info(&mut info);

// ... and attempt to be the one thread that stores it globally for
// all other threads
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/issues/issue-3656.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#![feature(rustc_private)]

extern crate libc;
use libc::{c_uint, uint32_t, c_void};
use libc::{c_uint, c_void};

pub struct KEYGEN {
hash_algorithm: [c_uint; 2],
count: uint32_t,
count: u32,
salt: *const c_void,
salt_size: uint32_t,
salt_size: u32,
}

extern {
Expand Down
6 changes: 5 additions & 1 deletion src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ const EXCEPTIONS: &[&str] = &[
"bytesize", // Apache-2.0, cargo
"im-rc", // MPL-2.0+, cargo
"adler32", // BSD-3-Clause AND Zlib, cargo dep that isn't used
"fortanix-sgx-abi", // MPL-2.0+, libstd but only for `sgx` target
"constant_time_eq", // CC0-1.0, rustfmt
"utf8parse", // Apache-2.0 OR MIT, cargo via strip-ansi-escapes
"vte", // Apache-2.0 OR MIT, cargo via strip-ansi-escapes
"sized-chunks", // MPL-2.0+, cargo via im-rc
// FIXME: this dependency violates the documentation comment above:
"fortanix-sgx-abi", // MPL-2.0+, libstd but only for `sgx` target
];

/// Which crates to check against the whitelist?
Expand All @@ -75,6 +76,7 @@ const WHITELIST: &[Crate<'_>] = &[
Crate("bitflags"),
Crate("build_const"),
Crate("byteorder"),
Crate("c2-chacha"),
Crate("cc"),
Crate("cfg-if"),
Crate("chalk-engine"),
Expand All @@ -96,6 +98,7 @@ const WHITELIST: &[Crate<'_>] = &[
Crate("fuchsia-zircon"),
Crate("fuchsia-zircon-sys"),
Crate("getopts"),
Crate("getrandom"),
Crate("humantime"),
Crate("indexmap"),
Crate("itertools"),
Expand All @@ -121,6 +124,7 @@ const WHITELIST: &[Crate<'_>] = &[
Crate("parking_lot_core"),
Crate("pkg-config"),
Crate("polonius-engine"),
Crate("ppv-lite86"),
Crate("proc-macro2"),
Crate("quick-error"),
Crate("quote"),
Expand Down

0 comments on commit fc3ef96

Please sign in to comment.