ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 08:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4976 from voutilad/openbsd-linker

Browse Source 
Fix linking of programs on OpenBSD
This commit is contained in:
gingerBill
2025-03-27 15:05:34 +00:00
committed by GitHub
parent 8b30adf60b 5274aa53b3
commit 71db9ac1ba
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/runtime/os_specific_bsd.odin
+1 -1
View File
@@ -9,7 +9,7 @@ foreign libc {
@(link_name="write") @(link_name="write")
_unix_write :: proc(fd: i32, buf: rawptr, size: int) -> int --- _unix_write :: proc(fd: i32, buf: rawptr, size: int) -> int ---
when ODIN_OS == .NetBSD { when ODIN_OS == .NetBSD || ODIN_OS == .OpenBSD {
@(link_name="__errno") __error :: proc() -> ^i32 --- @(link_name="__errno") __error :: proc() -> ^i32 ---
} else { } else {
__error :: proc() -> ^i32 --- __error :: proc() -> ^i32 ---
core/os/os_openbsd.odin
+1 -1
View File
@@ -343,7 +343,7 @@ AT_REMOVEDIR :: 0x08
@(default_calling_convention="c") @(default_calling_convention="c")
foreign libc { foreign libc {
@(link_name="__error") __error :: proc() -> ^c.int --- @(link_name="__errno") __error :: proc() -> ^c.int ---
@(link_name="fork") _unix_fork :: proc() -> pid_t --- @(link_name="fork") _unix_fork :: proc() -> pid_t ---
@(link_name="getthrid") _unix_getthrid :: proc() -> int --- @(link_name="getthrid") _unix_getthrid :: proc() -> int ---
src/linker.cpp
+7
View File
@@ -701,6 +701,13 @@ gb_internal i32 linker_stage(LinkerData *gen) {
// This points the linker to where the entry point is // This points the linker to where the entry point is
link_settings = gb_string_appendc(link_settings, "-e _main "); link_settings = gb_string_appendc(link_settings, "-e _main ");
} }
} else if (build_context.metrics.os == TargetOs_openbsd) {
// OpenBSD ports install shared libraries in /usr/local/lib. Also, we must explicitly link libpthread.
platform_lib_str = gb_string_appendc(platform_lib_str, "-lpthread -Wl,-L/usr/local/lib ");
// Until the LLVM back-end can be adapted to emit endbr64 instructions on amd64, we
// need to pass -z nobtcfi in order to allow the resulting program to run under
// OpenBSD 7.4 and newer. Once support is added at compile time, this can be dropped.
platform_lib_str = gb_string_appendc(platform_lib_str, "-Wl,-z,nobtcfi ");
} }
if (!build_context.no_rpath) { if (!build_context.no_rpath) {