Merge remote-tracking branch 'origin/master' into llvm7

2018-04-04 17:22:26 -04:00
parent c541ac240c 8938429ea1
commit cca93908e6
61 changed files with 3136 additions and 1369 deletions
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -862,6 +862,10 @@ Buf *target_dynamic_linker(ZigTarget *target) {
            env == ZigLLVM_GNUX32)
    {
        return buf_create_from_str("/libx32/ld-linux-x32.so.2");
+    } else if (arch == ZigLLVM_x86_64 &&
+            (env == ZigLLVM_Musl || env == ZigLLVM_MuslEABI || env == ZigLLVM_MuslEABIHF))
+    {
+        return buf_create_from_str("/lib/ld-musl-x86_64.so.1");
    } else {
        return buf_create_from_str("/lib64/ld-linux-x86-64.so.2");
    }