authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-07 13:04:10-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-07 13:04:10-05:00
loge2ce00f272acdf3a0b5bdb3f9322aa1c487c483d
tree3d54be5c7ed157c65bc321d035a13e3a9d696284
parentffaa4f0a87af60718062c3a9eeab9fb354731241

fix regressions on macos

5 files changed, 44 insertions(+), 68 deletions(-)

src/codegen.cpp+3-5
......@@ -240,10 +240,6 @@ void codegen_set_emit_file_type(CodeGen *g, EmitFileType emit_file_type) {
240240 g->emit_file_type = emit_file_type;
241241}
242242
243void codegen_set_is_static(CodeGen *g, bool is_static) {
244 g->is_static = is_static;
245}
246
247243void codegen_set_each_lib_rpath(CodeGen *g, bool each_lib_rpath) {
248244 g->each_lib_rpath = each_lib_rpath;
249245}
......@@ -9265,7 +9261,9 @@ void codegen_build_and_link(CodeGen *g) {
92659261 }
92669262 }
92679263
9268 if (g->emit_file_type == EmitFileTypeBinary && !compilation_is_already_done(g)) {
9264 if (g->emit_file_type == EmitFileTypeBinary &&
9265 (g->link_objects.length > 1 || g->out_type != OutTypeObj))
9266 {
92699267 codegen_link(g);
92709268 }
92719269 }
src/codegen.hpp-1
......@@ -25,7 +25,6 @@ void codegen_set_is_test(CodeGen *codegen, bool is_test);
2525void codegen_set_each_lib_rpath(CodeGen *codegen, bool each_lib_rpath);
2626
2727void codegen_set_emit_file_type(CodeGen *g, EmitFileType emit_file_type);
28void codegen_set_is_static(CodeGen *codegen, bool is_static);
2928void codegen_set_strip(CodeGen *codegen, bool strip);
3029void codegen_set_errmsg_color(CodeGen *codegen, ErrColor err_color);
3130void codegen_set_out_name(CodeGen *codegen, Buf *out_name);
src/link.cpp+33-58
......@@ -574,7 +574,7 @@ static Buf *build_a_raw(CodeGen *parent_gen, const char *aname, Buf *full_path)
574574
575575 CodeGen *child_gen = create_child_codegen(parent_gen, full_path, child_out_type,
576576 parent_gen->libc);
577 codegen_set_is_static(child_gen, true);
577 child_gen->is_static = true;
578578 codegen_set_out_name(child_gen, buf_create_from_str(aname));
579579
580580 // This is so that compiler_rt and builtin libraries know whether they
......@@ -699,7 +699,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
699699 lj->args.append(getLDMOption(g->zig_target));
700700
701701 bool is_lib = g->out_type == OutTypeLib;
702 bool shared = !g->is_static && is_lib;
702 bool is_dyn_lib = !g->is_static && is_lib;
703703 Buf *soname = nullptr;
704704 if (g->is_static) {
705705 if (g->zig_target->arch == ZigLLVM_arm || g->zig_target->arch == ZigLLVM_armeb ||
......@@ -709,7 +709,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
709709 } else {
710710 lj->args.append("-static");
711711 }
712 } else if (shared) {
712 } else if (is_dyn_lib) {
713713 lj->args.append("-shared");
714714
715715 if (buf_len(&g->output_file_path) == 0) {
......@@ -780,7 +780,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
780780
781781 }
782782
783 if (shared) {
783 if (is_dyn_lib) {
784784 lj->args.append("-soname");
785785 lj->args.append(buf_ptr(soname));
786786 }
......@@ -1231,36 +1231,34 @@ static void construct_linker_job_macho(LinkJob *lj) {
12311231 }
12321232
12331233 bool is_lib = g->out_type == OutTypeLib;
1234 bool shared = !g->is_static && is_lib;
1234 bool is_dyn_lib = !g->is_static && is_lib;
12351235 if (g->is_static) {
12361236 lj->args.append("-static");
12371237 } else {
12381238 lj->args.append("-dynamic");
12391239 }
12401240
1241 if (is_lib) {
1242 if (!g->is_static) {
1243 lj->args.append("-dylib");
1241 if (is_dyn_lib) {
1242 lj->args.append("-dylib");
12441243
1245 Buf *compat_vers = buf_sprintf("%" ZIG_PRI_usize ".0.0", g->version_major);
1246 lj->args.append("-compatibility_version");
1247 lj->args.append(buf_ptr(compat_vers));
1244 Buf *compat_vers = buf_sprintf("%" ZIG_PRI_usize ".0.0", g->version_major);
1245 lj->args.append("-compatibility_version");
1246 lj->args.append(buf_ptr(compat_vers));
12481247
1249 Buf *cur_vers = buf_sprintf("%" ZIG_PRI_usize ".%" ZIG_PRI_usize ".%" ZIG_PRI_usize,
1250 g->version_major, g->version_minor, g->version_patch);
1251 lj->args.append("-current_version");
1252 lj->args.append(buf_ptr(cur_vers));
1248 Buf *cur_vers = buf_sprintf("%" ZIG_PRI_usize ".%" ZIG_PRI_usize ".%" ZIG_PRI_usize,
1249 g->version_major, g->version_minor, g->version_patch);
1250 lj->args.append("-current_version");
1251 lj->args.append(buf_ptr(cur_vers));
12531252
1254 // TODO getting an error when running an executable when doing this rpath thing
1255 //Buf *dylib_install_name = buf_sprintf("@rpath/lib%s.%" ZIG_PRI_usize ".dylib",
1256 // buf_ptr(g->root_out_name), g->version_major);
1257 //lj->args.append("-install_name");
1258 //lj->args.append(buf_ptr(dylib_install_name));
1253 // TODO getting an error when running an executable when doing this rpath thing
1254 //Buf *dylib_install_name = buf_sprintf("@rpath/lib%s.%" ZIG_PRI_usize ".dylib",
1255 // buf_ptr(g->root_out_name), g->version_major);
1256 //lj->args.append("-install_name");
1257 //lj->args.append(buf_ptr(dylib_install_name));
12591258
1260 if (buf_len(&g->output_file_path) == 0) {
1261 buf_appendf(&g->output_file_path, "lib%s.%" ZIG_PRI_usize ".%" ZIG_PRI_usize ".%" ZIG_PRI_usize ".dylib",
1262 buf_ptr(g->root_out_name), g->version_major, g->version_minor, g->version_patch);
1263 }
1259 if (buf_len(&g->output_file_path) == 0) {
1260 buf_appendf(&g->output_file_path, "lib%s.%" ZIG_PRI_usize ".%" ZIG_PRI_usize ".%" ZIG_PRI_usize ".dylib",
1261 buf_ptr(g->root_out_name), g->version_major, g->version_minor, g->version_patch);
12641262 }
12651263 }
12661264
......@@ -1302,38 +1300,14 @@ static void construct_linker_job_macho(LinkJob *lj) {
13021300 Buf *rpath = g->rpath_list.at(i);
13031301 add_rpath(lj, rpath);
13041302 }
1305 add_rpath(lj, &g->output_file_path);
1303 if (is_dyn_lib) {
1304 add_rpath(lj, &g->output_file_path);
1305 }
13061306
1307 if (shared) {
1307 if (is_dyn_lib) {
13081308 if (g->system_linker_hack) {
13091309 lj->args.append("-headerpad_max_install_names");
13101310 }
1311 } else if (g->is_static) {
1312 lj->args.append("-lcrt0.o");
1313 } else {
1314 switch (platform.kind) {
1315 case MacOS:
1316 if (darwin_version_lt(&platform, 10, 5)) {
1317 lj->args.append("-lcrt1.o");
1318 } else if (darwin_version_lt(&platform, 10, 6)) {
1319 lj->args.append("-lcrt1.10.5.o");
1320 } else if (darwin_version_lt(&platform, 10, 8)) {
1321 lj->args.append("-lcrt1.10.6.o");
1322 }
1323 break;
1324 case IPhoneOS:
1325 if (g->zig_target->arch == ZigLLVM_aarch64) {
1326 // iOS does not need any crt1 files for arm64
1327 } else if (darwin_version_lt(&platform, 3, 1)) {
1328 lj->args.append("-lcrt1.o");
1329 } else if (darwin_version_lt(&platform, 6, 0)) {
1330 lj->args.append("-lcrt1.3.1.o");
1331 }
1332 break;
1333 case IPhoneOSSimulator:
1334 // no crt1.o needed
1335 break;
1336 }
13371311 }
13381312
13391313 for (size_t i = 0; i < g->lib_dirs.length; i += 1) {
......@@ -1347,7 +1321,7 @@ static void construct_linker_job_macho(LinkJob *lj) {
13471321 }
13481322
13491323 // compiler_rt on darwin is missing some stuff, so we still build it and rely on LinkOnce
1350 if (g->out_type == OutTypeExe || (g->out_type == OutTypeLib && !g->is_static)) {
1324 if (g->out_type == OutTypeExe || is_dyn_lib) {
13511325 Buf *compiler_rt_o_path = build_compiler_rt(g);
13521326 lj->args.append(buf_ptr(compiler_rt_o_path));
13531327 }
......@@ -1356,11 +1330,7 @@ static void construct_linker_job_macho(LinkJob *lj) {
13561330 for (size_t lib_i = 0; lib_i < g->link_libs_list.length; lib_i += 1) {
13571331 LinkLib *link_lib = g->link_libs_list.at(lib_i);
13581332 if (buf_eql_str(link_lib->name, "c")) {
1359 // on Darwin, libSystem has libc in it, but also you have to use it
1360 // to make syscalls because the syscall numbers are not documented
1361 // and change between versions.
1362 // so we always link against libSystem
1363 lj->args.append("-lSystem");
1333 continue;
13641334 } else {
13651335 if (strchr(buf_ptr(link_lib->name), '/') == nullptr) {
13661336 Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
......@@ -1370,6 +1340,11 @@ static void construct_linker_job_macho(LinkJob *lj) {
13701340 }
13711341 }
13721342 }
1343 // on Darwin, libSystem has libc in it, but also you have to use it
1344 // to make syscalls because the syscall numbers are not documented
1345 // and change between versions.
1346 // so we always link against libSystem
1347 lj->args.append("-lSystem");
13731348 } else {
13741349 lj->args.append("-undefined");
13751350 lj->args.append("dynamic_lookup");
src/main.cpp+1-1
......@@ -1037,7 +1037,7 @@ int main(int argc, char **argv) {
10371037
10381038 codegen_set_llvm_argv(g, llvm_argv.items + 1, llvm_argv.length - 2);
10391039 codegen_set_strip(g, strip);
1040 codegen_set_is_static(g, is_static);
1040 g->is_static = is_static;
10411041 if (dynamic_linker != nullptr)
10421042 codegen_set_dynamic_linker(g, buf_create_from_str(dynamic_linker));
10431043 g->verbose_tokenize = verbose_tokenize;
src/os.cpp+7-3
......@@ -1414,13 +1414,17 @@ static void init_rand() {
14141414 if (fd == -1) {
14151415 zig_panic("unable to open /dev/urandom");
14161416 }
1417 const char bytes[sizeof(unsigned)];
1418 unsigned seed;
1419 while (read(fd, bytes, sizeof(unsigned)) == -1) {
1417 char bytes[sizeof(unsigned)];
1418 size_t amt_read;
1419 while ((amt_read = read(fd, bytes, sizeof(unsigned))) == -1) {
14201420 if (errno == EINTR) continue;
14211421 zig_panic("unable to read /dev/urandom");
14221422 }
1423 if (amt_read != sizeof(unsigned)) {
1424 zig_panic("unable to read enough bytes from /dev/urandom");
1425 }
14231426 close(fd);
1427 unsigned seed;
14241428 memcpy(&seed, bytes, sizeof(unsigned));
14251429 srand(seed);
14261430#endif