user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #38707 - redox-os:master, r=brson

Browse source 
Add socket timeout and ttl support in `sys::redox`

This adds support for `read_timeout`, `write_timeout`, and `ttl` on `TcpStream`, `TcpListener`, and `UdpSocket` in the `sys::redox` module.

The DNS lookup has been set to use a 5 second timeout by default.
This commit is contained in:
bors 2017-01-04 04:28:15 +00:00
commit 01677eeef2
5 changed files with 125 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_back/target/redox_base.rs
View file

@ -25,14 +25,7 @@ pub fn opts() -> TargetOptions {
"-Wl,--as-needed".to_string(),
// Always enable NX protection when it is available
"-Wl,-z,noexecstack".to_string(),
// Static link
"-static".to_string()
],
late_link_args: vec![
"-lc".to_string(),
"-lm".to_string()
"-Wl,-z,noexecstack".to_string()
],
executables: true,
relocation_model: "static".to_string(),
@ -40,7 +33,6 @@ pub fn opts() -> TargetOptions {
eliminate_frame_pointer: false,
target_family: None,
linker_is_gnu: true,
no_default_libraries: true,
lib_allocation_crate: "alloc_system".to_string(),
exe_allocation_crate: "alloc_system".to_string(),
has_elf_tls: true,