motiejus/zig
1
Fork 0
Code Releases Activity

Merge branch 'freebsd-up' of https://github.com/myfreeweb/zig into freebsd2

Browse Source
This commit is contained in:
Andrew Kelley
2018-11-19 17:24:41 -05:00
parent 703c6684d1 f3bc1c38bf
commit 9493738e54
30 changed files with 1757 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/link.cpp
View File

@@ -150,6 +150,10 @@ static const char *getLDMOption(const ZigTarget *t) {
if (t->env_type == ZigLLVM_GNUX32) {
return "elf32_x86_64";
}
// Any target elf will use the freebsd osabi if suffixed with "_fbsd".
if (t->os == OsFreeBSD) {
return "elf_x86_64_fbsd";
}
return "elf_x86_64";
default:
zig_unreachable();
@@ -191,6 +195,9 @@ static Buf *try_dynamic_linker_path(const char *ld_name) {
}
static Buf *get_dynamic_linker_path(CodeGen *g) {
if (g->zig_target.os == OsFreeBSD) {
return buf_create_from_str("/libexec/ld-elf.so.1");
}
if (g->is_native_target && g->zig_target.arch.arch == ZigLLVM_x86_64) {
static const char *ld_names[] = {
"ld-linux-x86-64.so.2",