Commit dd263eccb716ba167fdad5bb3a4544dace6bf6a1 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-03-05 14:12:31-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-03-05 14:12:46-05:00
log	dd263eccb716ba167fdad5bb3a4544dace6bf6a1
tree	6d1a2d445ebe0c5d83c99ec04b1a867bd1230916
parent	c5fdea59d36dffcac95b71c20609a44d34b1935a
signature	Commit is signed but in an unrecognized format.

support crtbegin.o and crtend.o when using explicit libc

1 files changed, 22 insertions(+), 0 deletions(-)

src
- link.cpp

src/link.cpp+22

 @@ -305,6 +305,13 @@ static const char *get_libc_crt_file(CodeGen *parent, const char *file) {
     }
 }
+static const char *get_libc_static_file(CodeGen *g, const char *file) {
+    assert(g->libc != nullptr);
+    Buf *out_buf = buf_alloc();
+    os_path_join(&g->libc->static_lib_dir, buf_create_from_str(file), out_buf);
+    return buf_ptr(out_buf);
+}
 static Buf *build_a_raw(CodeGen *parent_gen, const char *aname, Buf *full_path) {
     // The Mach-O LLD code is not well maintained, and trips an assertion
     // when we link compiler_rt and builtin as libraries rather than objects.
 @@ -425,6 +432,11 @@ static void add_rpath(LinkJob *lj, Buf *rpath) {
     lj->rpath_table.put(rpath, true);
 }
+// TODO: try to get away with completely removing this functionality
+static bool want_gcc_objects(CodeGen *g) {
+    return g->libc != nullptr && buf_len(&g->libc->static_lib_dir) != 0;
+}
 static void construct_linker_job_elf(LinkJob *lj) {
     CodeGen *g = lj->codegen;
 @@ -468,15 +480,22 @@ static void construct_linker_job_elf(LinkJob *lj) {
     if (lj->link_in_crt) {
         const char *crt1o;
+        const char *crtbegino;
         if (g->zig_target->os == OsNetBSD) {
             crt1o = "crt0.o";
+            crtbegino = "crtbegin.o";
         } else if (g->is_static) {
             crt1o = "crt1.o";
+            crtbegino = "crtbeginT.o";
         } else {
             crt1o = "Scrt1.o";
+            crtbegino = "crtbegin.o";
         }
         lj->args.append(get_libc_crt_file(g, crt1o));
         lj->args.append(get_libc_crt_file(g, "crti.o"));
+        if (want_gcc_objects(g)) {
+            lj->args.append(get_libc_static_file(g, crtbegino));
+        }
     }
     for (size_t i = 0; i < g->rpath_list.length; i += 1) {
 @@ -605,6 +624,9 @@ static void construct_linker_job_elf(LinkJob *lj) {
     // crt end
     if (lj->link_in_crt) {
+        if (want_gcc_objects(g)) {
+            lj->args.append(get_libc_static_file(g, "crtend.o"));
+        }
         lj->args.append(get_libc_crt_file(g, "crtn.o"));
     }