motiejus/zig
1
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/llvm8'

Browse Source
This commit is contained in:
Andrew Kelley
2019-03-20 13:34:07 -04:00
parent 2fdf69bc40 1b25dcde96
commit 3c7555cb67
773 changed files with 25680 additions and 9971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/link.cpp
View File

@@ -344,9 +344,7 @@ static const char *glibc_start_asm_path(CodeGen *parent, const char *file) {
buf_resize(&result, 0);
buf_append_buf(&result, parent->zig_lib_dir);
buf_append_str(&result, OS_SEP "libc" OS_SEP "glibc" OS_SEP "sysdeps" OS_SEP);
if (arch == ZigLLVM_nios2) {
buf_append_str(&result, "nios2");
} else if (is_sparc) {
if (is_sparc) {
if (is_64) {
buf_append_str(&result, "sparc" OS_SEP "sparc64");
} else {
@@ -878,6 +876,10 @@ static const char *getLDMOption(const ZigTarget *t) {
return "elf_x86_64_fbsd";
}
return "elf_x86_64";
case ZigLLVM_riscv32:
return "elf32lriscv";
case ZigLLVM_riscv64:
return "elf64lriscv";
default:
zig_unreachable();
}