Skip to content

Commit a7402e3

Browse files
committed
Update #38335 with main.
Bring drexin's FreeBSD support patch up to date with main. Resolved conflicts in prior merge commit and made some minor buildfixes. Still requires some other more general fixes outside this pr to have this build properly at HEAD but have verified only this builds OK with those fixes possibly TK including #59987 on FreeBSD 12.3. Note: I don't intend to support this platform as a priority.
1 parent 7845b10 commit a7402e3

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

lib/Threading/Pthreads.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ swift::threading_impl::thread_get_current_stack_bounds() {
101101
#if defined(__FreeBSD__)
102102
if (pthread_attr_init(&attr))
103103
return {};
104+
#define pthread_getattr_np pthread_attr_get_np
104105
#endif
105106

106107
if (!pthread_getattr_np(pthread_self(), &attr)) {

stdlib/public/CommandLineSupport/CommandLine.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include <shellapi.h>
3737
#endif
3838

39+
#include <errno.h>
40+
3941
// Backing storage for overrides of `Swift.CommandLine.arguments`.
4042
static char **_swift_stdlib_ProcessOverrideUnsafeArgv = nullptr;
4143
static int _swift_stdlib_ProcessOverrideUnsafeArgc = 0;

0 commit comments

Comments
 (0)