From 917ff60a4b7999b3f4f0911c4bc6c8322cfaf242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Marie?= <semarie@users.noreply.github.com>
Date: Sat, 2 Mar 2019 13:14:17 +0100
Subject: [PATCH] adjust PTHREAD_STACK_MIN to current value on OpenBSD
while here, generate the right file in test_openbsd()
---
libc-test/build.rs | 2 +-
src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs | 1 +
src/unix/bsd/netbsdlike/openbsdlike/mod.rs | 2 --
src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 89ca488a..d3d35614 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1088,7 +1088,7 @@ fn test_openbsd(target: &str) {
(struct_ == "siginfo_t" && field == "si_addr")
});
- cfg.generate("../src/lib.rs", "linux_fcntl.rs");
+ cfg.generate("../src/lib.rs", "main.rs");
}
fn test_windows(target: &str) {
diff --git a/src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs
index 5cabac54..f73d7de7 100644
--- a/src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs
+++ b/src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs
@@ -98,6 +98,7 @@ pub const IFF_LINK1: ::c_int = 0x2000; // per link layer defined bit
pub const IFF_LINK2: ::c_int = 0x4000; // per link layer defined bit
pub const IFF_MULTICAST: ::c_int = 0x8000; // supports multicast
+pub const PTHREAD_STACK_MIN : ::size_t = 2048;
pub const SIGSTKSZ : ::size_t = 40960;
pub const PT_FIRSTMACH: ::c_int = 32;
diff --git a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
index c94ad15a..cf9dc8f5 100644
--- a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
+++ b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
@@ -399,8 +399,6 @@ pub const O_RSYNC: ::c_int = O_SYNC;
pub const MS_SYNC : ::c_int = 0x0002;
pub const MS_INVALIDATE : ::c_int = 0x0004;
-pub const PTHREAD_STACK_MIN : ::size_t = 2048;
-
pub const POLLNORM: ::c_short = ::POLLRDNORM;
pub const ENOATTR : ::c_int = 83;
diff --git a/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
index 435523f1..c1687111 100644
--- a/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
@@ -403,6 +403,7 @@ pub const IFF_LINK1: ::c_int = 0x2000; // per link layer defined bit
pub const IFF_LINK2: ::c_int = 0x4000; // per link layer defined bit
pub const IFF_MULTICAST: ::c_int = 0x8000; // supports multicast
+pub const PTHREAD_STACK_MIN : ::size_t = 4096;
pub const SIGSTKSZ : ::size_t = 28672;
pub const PT_FIRSTMACH: ::c_int = 32;
--
GitLab