authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-11-27 17:54:22-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-11-27 17:54:22-07:00
log9268972ff942f1d9db8fd0b89a8efe528d67e930
tree45a3a65f31c53e6839e27aa831f8cd49d9e8b9a4
parent9e4360c335c543ad4ff80791257eabfc556f3ac1
parentc3b0182f31c874eb9f1bb21397debdfdbf6161d3

Merge branch 'kubkon-elf-soname-opt-in' into master

closes #7162

5 files changed, 54 insertions(+), 29 deletions(-)

src/Compilation.zig+2-2
......@@ -364,7 +364,7 @@ pub const InitOptions = struct {
364364 link_emit_relocs: bool = false,
365365 linker_script: ?[]const u8 = null,
366366 version_script: ?[]const u8 = null,
367 override_soname: ?[]const u8 = null,
367 soname: ?[]const u8 = null,
368368 linker_gc_sections: ?bool = null,
369369 linker_allow_shlib_undefined: ?bool = null,
370370 linker_bind_global_refs_locally: ?bool = null,
......@@ -828,7 +828,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
828828 .emit_relocs = options.link_emit_relocs,
829829 .rdynamic = options.rdynamic,
830830 .extra_lld_args = options.lld_argv,
831 .override_soname = options.override_soname,
831 .soname = options.soname,
832832 .version = options.version,
833833 .libc_installation = libc_dirs.libc_installation,
834834 .pic = pic,
src/glibc.zig+4-3
......@@ -911,13 +911,14 @@ fn buildSharedLib(
911911 const tracy = trace(@src());
912912 defer tracy.end();
913913
914 const basename = try std.fmt.allocPrint(arena, "lib{s}.so.{d}", .{ lib.name, lib.sover });
914915 const emit_bin = Compilation.EmitLoc{
915916 .directory = bin_directory,
916 .basename = try std.fmt.allocPrint(arena, "lib{s}.so.{d}", .{ lib.name, lib.sover }),
917 .basename = basename,
917918 };
918919 const version: std.builtin.Version = .{ .major = lib.sover, .minor = 0, .patch = 0 };
919920 const ld_basename = path.basename(comp.getTarget().standardDynamicLinkerPath().get().?);
920 const override_soname = if (mem.eql(u8, lib.name, "ld")) ld_basename else null;
921 const soname = if (mem.eql(u8, lib.name, "ld")) ld_basename else basename;
921922 const map_file_path = try path.join(arena, &[_][]const u8{ bin_directory.path.?, all_map_basename });
922923 const c_source_files = [1]Compilation.CSourceFile{
923924 .{
......@@ -955,7 +956,7 @@ fn buildSharedLib(
955956 .clang_passthrough_mode = comp.clang_passthrough_mode,
956957 .version = version,
957958 .version_script = map_file_path,
958 .override_soname = override_soname,
959 .soname = soname,
959960 .c_source_files = &c_source_files,
960961 .is_compiler_rt_or_libc = true,
961962 });
src/link.zig+1-1
......@@ -88,7 +88,7 @@ pub const Options = struct {
8888 subsystem: ?std.Target.SubSystem,
8989 linker_script: ?[]const u8,
9090 version_script: ?[]const u8,
91 override_soname: ?[]const u8,
91 soname: ?[]const u8,
9292 llvm_cpu_features: ?[*:0]const u8,
9393 /// Extra args passed directly to LLD. Ignored when not linking with LLD.
9494 extra_lld_args: []const []const u8,
src/link/Elf.zig+6-11
......@@ -1313,10 +1313,8 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
13131313 man.hash.addOptionalBytes(self.base.options.dynamic_linker);
13141314 }
13151315 }
1316 if (is_dyn_lib) {
1317 man.hash.addOptionalBytes(self.base.options.override_soname);
1318 man.hash.addOptional(self.base.options.version);
1319 }
1316 man.hash.addOptionalBytes(self.base.options.soname);
1317 man.hash.addOptional(self.base.options.version);
13201318 man.hash.addStringSet(self.base.options.system_libs);
13211319 man.hash.add(allow_shlib_undefined);
13221320 man.hash.add(self.base.options.bind_global_refs_locally);
......@@ -1512,13 +1510,10 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
15121510 }
15131511
15141512 if (is_dyn_lib) {
1515 const soname = self.base.options.override_soname orelse if (self.base.options.version) |ver|
1516 try std.fmt.allocPrint(arena, "lib{}.so.{}", .{ self.base.options.root_name, ver.major })
1517 else
1518 try std.fmt.allocPrint(arena, "lib{}.so", .{self.base.options.root_name});
1519 try argv.append("-soname");
1520 try argv.append(soname);
1521
1513 if (self.base.options.soname) |soname| {
1514 try argv.append("-soname");
1515 try argv.append(soname);
1516 }
15221517 if (self.base.options.version_script) |version_script| {
15231518 try argv.append("-version-script");
15241519 try argv.append(version_script);
src/main.zig+41-12
......@@ -306,6 +306,8 @@ const usage_build_generic =
306306 \\ --version-script [path] Provide a version .map file
307307 \\ --dynamic-linker [path] Set the dynamic interpreter path (usually ld.so)
308308 \\ --version [ver] Dynamic library semver
309 \\ -fsoname[=name] (linux) Override the default SONAME value
310 \\ -fno-soname (linux) Disable emitting a SONAME
309311 \\ -rdynamic Add all symbols to the dynamic symbol table
310312 \\ -rpath [path] Add directory to the runtime library search path
311313 \\ -feach-lib-rpath Ensure adding rpath for each used dynamic library
......@@ -350,6 +352,12 @@ const repl_help =
350352 \\
351353;
352354
355const SOName = union(enum) {
356 no,
357 yes_default_value,
358 yes: []const u8,
359};
360
353361const Emit = union(enum) {
354362 no,
355363 yes_default_path,
......@@ -452,6 +460,7 @@ fn buildOutputType(
452460 var target_ofmt: ?[]const u8 = null;
453461 var output_mode: std.builtin.OutputMode = undefined;
454462 var emit_h: Emit = undefined;
463 var soname: SOName = undefined;
455464 var ensure_libc_on_non_freestanding = false;
456465 var ensure_libcpp_on_non_freestanding = false;
457466 var link_libc = false;
......@@ -467,7 +476,6 @@ fn buildOutputType(
467476 var linker_script: ?[]const u8 = null;
468477 var version_script: ?[]const u8 = null;
469478 var disable_c_depfile = false;
470 var override_soname: ?[]const u8 = null;
471479 var linker_gc_sections: ?bool = null;
472480 var linker_allow_shlib_undefined: ?bool = null;
473481 var linker_bind_global_refs_locally: ?bool = null;
......@@ -564,6 +572,8 @@ fn buildOutputType(
564572 // .translate_c, .zig_test, .run => emit_h = .no,
565573 // else => unreachable,
566574 //}
575
576 soname = .yes_default_value;
567577 const args = all_args[2..];
568578 var i: usize = 0;
569579 args_loop: while (i < args.len) : (i += 1) {
......@@ -828,6 +838,12 @@ fn buildOutputType(
828838 use_clang = false;
829839 } else if (mem.eql(u8, arg, "-rdynamic")) {
830840 rdynamic = true;
841 } else if (mem.eql(u8, arg, "-fsoname")) {
842 soname = .yes_default_value;
843 } else if (mem.startsWith(u8, arg, "-fsoname=")) {
844 soname = .{ .yes = arg["-fsoname=".len..] };
845 } else if (mem.eql(u8, arg, "-fno-soname")) {
846 soname = .no;
831847 } else if (mem.eql(u8, arg, "-femit-bin")) {
832848 emit_bin = .yes_default_path;
833849 } else if (mem.startsWith(u8, arg, "-femit-bin=")) {
......@@ -955,6 +971,7 @@ fn buildOutputType(
955971 },
956972 .cc, .cpp => {
957973 emit_h = .no;
974 soname = .no;
958975 strip = true;
959976 ensure_libc_on_non_freestanding = true;
960977 ensure_libcpp_on_non_freestanding = arg_mode == .cpp;
......@@ -1108,33 +1125,33 @@ fn buildOutputType(
11081125 if (i >= linker_args.items.len) {
11091126 fatal("expected linker arg after '{}'", .{arg});
11101127 }
1111 const soname = linker_args.items[i];
1112 override_soname = soname;
1128 const name = linker_args.items[i];
1129 soname = .{ .yes = name };
11131130 // Use it as --name.
11141131 // Example: libsoundio.so.2
11151132 var prefix: usize = 0;
1116 if (mem.startsWith(u8, soname, "lib")) {
1133 if (mem.startsWith(u8, name, "lib")) {
11171134 prefix = 3;
11181135 }
1119 var end: usize = soname.len;
1120 if (mem.endsWith(u8, soname, ".so")) {
1136 var end: usize = name.len;
1137 if (mem.endsWith(u8, name, ".so")) {
11211138 end -= 3;
11221139 } else {
11231140 var found_digit = false;
1124 while (end > 0 and std.ascii.isDigit(soname[end - 1])) {
1141 while (end > 0 and std.ascii.isDigit(name[end - 1])) {
11251142 found_digit = true;
11261143 end -= 1;
11271144 }
1128 if (found_digit and end > 0 and soname[end - 1] == '.') {
1145 if (found_digit and end > 0 and name[end - 1] == '.') {
11291146 end -= 1;
11301147 } else {
1131 end = soname.len;
1148 end = name.len;
11321149 }
1133 if (mem.endsWith(u8, soname[prefix..end], ".so")) {
1150 if (mem.endsWith(u8, name[prefix..end], ".so")) {
11341151 end -= 3;
11351152 }
11361153 }
1137 provided_name = soname[prefix..end];
1154 provided_name = name[prefix..end];
11381155 } else if (mem.eql(u8, arg, "-rpath")) {
11391156 i += 1;
11401157 if (i >= linker_args.items.len) {
......@@ -1433,6 +1450,18 @@ fn buildOutputType(
14331450 const have_enable_cache = enable_cache orelse false;
14341451 const optional_version = if (have_version) version else null;
14351452
1453 const resolved_soname: ?[]const u8 = switch (soname) {
1454 .yes => |explicit| explicit,
1455 .no => null,
1456 .yes_default_value => switch (object_format) {
1457 .elf => if (have_version)
1458 try std.fmt.allocPrint(arena, "lib{s}.so.{d}", .{ root_name, version.major })
1459 else
1460 try std.fmt.allocPrint(arena, "lib{s}.so", .{root_name}),
1461 else => null,
1462 },
1463 };
1464
14361465 const emit_bin_loc: ?Compilation.EmitLoc = switch (emit_bin) {
14371466 .no => null,
14381467 .yes_default_path => Compilation.EmitLoc{
......@@ -1660,7 +1689,7 @@ fn buildOutputType(
16601689 .linker_script = linker_script,
16611690 .version_script = version_script,
16621691 .disable_c_depfile = disable_c_depfile,
1663 .override_soname = override_soname,
1692 .soname = resolved_soname,
16641693 .linker_gc_sections = linker_gc_sections,
16651694 .linker_allow_shlib_undefined = linker_allow_shlib_undefined,
16661695 .linker_bind_global_refs_locally = linker_bind_global_refs_locally,