Commit 030abfa0d2a95fb5cb9da61c59bb8332c65f8819 | zig

author	meme <meme@users.noreply.github.com> 2019-09-28 13:21:29-04:00
committer	meme <meme@users.noreply.github.com> 2019-09-28 13:21:29-04:00
log	030abfa0d2a95fb5cb9da61c59bb8332c65f8819
tree	b2b4122799ba50d4bd09b6e219ea4fa26db0821b
parent	0c556095f40bfd935bf1c1c8a638b7bc8dfcfb8a

minor tweaks

1 files changed, 12 insertions(+), 10 deletions(-)

src
- link.cpp

src/link.cpp+12-10

 @@ -1653,7 +1653,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
         soname = buf_sprintf("lib%s.so.%" ZIG_PRI_usize, buf_ptr(g->root_out_name), g->version_major);
     }
-    if (target_requires_pie(g->zig_target) && !is_dyn_lib && g->libc != nullptr) {
+    if (target_requires_pie(g->zig_target) && g->out_type == OutTypeExe) {
         lj->args.append("-pie");
     }
 @@ -1665,13 +1665,13 @@ static void construct_linker_job_elf(LinkJob *lj) {
         if (g->zig_target->os == OsNetBSD) {
             crt1o = "crt0.o";
         } else if (target_is_android(g->zig_target)) {
-            crt1o = "crtbegin_dynamic.o";
+            if (g->have_dynamic_link) {
-        } else if (!g->have_dynamic_link) {
+                crt1o = "crtbegin_dynamic.o";
-            if (target_is_android(g->zig_target)) {
-                crt1o = "crtbegin.o";
             } else {
-                crt1o = "crt1.o";
+                crt1o = "crtbegin_static.o";
             }
+        } else if (!g->have_dynamic_link) {
+            crt1o = "crt1.o";
         } else {
             crt1o = "Scrt1.o";
         }
 @@ -1821,10 +1821,12 @@ static void construct_linker_job_elf(LinkJob *lj) {
     }
     // crt end
-    if (target_is_android(g->zig_target) && g->libc != nullptr) {
+    if (lj->link_in_crt) {
-        lj->args.append(get_libc_crt_file(g, "crtend_android.o"));
+        if (target_is_android(g->zig_target)) {
-    } else if (lj->link_in_crt && target_libc_needs_crti_crtn(g->zig_target)) {
+            lj->args.append(get_libc_crt_file(g, "crtend_android.o"));
-        lj->args.append(get_libc_crt_file(g, "crtn.o"));
+        } else if (target_libc_needs_crti_crtn(g->zig_target)) {
+            lj->args.append(get_libc_crt_file(g, "crtn.o"));
+        }
     }
     if (!g->zig_target->is_native) {