zig cc: recognize a few more linker options
* `--major-image-version` * `--minor-image-version` * `--stack`master
parent
15ab61b2a0
commit
64d0960244
|
@ -2259,6 +2259,7 @@ struct CodeGen {
|
|||
size_t version_minor;
|
||||
size_t version_patch;
|
||||
const char *linker_script;
|
||||
size_t stack_size_override;
|
||||
|
||||
BuildMode build_mode;
|
||||
OutType out_type;
|
||||
|
|
|
@ -10597,6 +10597,7 @@ static Error check_cache(CodeGen *g, Buf *manifest_dir, Buf *digest) {
|
|||
cache_int(ch, g->linker_allow_shlib_undefined);
|
||||
cache_bool(ch, g->linker_z_nodelete);
|
||||
cache_bool(ch, g->linker_z_defs);
|
||||
cache_usize(ch, g->stack_size_override);
|
||||
|
||||
// gen_c_objects appends objects to g->link_objects which we want to include in the hash
|
||||
gen_c_objects(g);
|
||||
|
|
|
@ -1840,7 +1840,8 @@ static void construct_linker_job_elf(LinkJob *lj) {
|
|||
|
||||
if (g->out_type == OutTypeExe) {
|
||||
lj->args.append("-z");
|
||||
lj->args.append("stack-size=16777216"); // default to 16 MiB
|
||||
size_t stack_size = (g->stack_size_override == 0) ? 16777216 : g->stack_size_override;
|
||||
lj->args.append(buf_ptr(buf_sprintf("stack-size=%" ZIG_PRI_usize, stack_size)));
|
||||
}
|
||||
|
||||
if (g->linker_script) {
|
||||
|
@ -2479,7 +2480,8 @@ static void construct_linker_job_coff(LinkJob *lj) {
|
|||
|
||||
if (g->out_type == OutTypeExe) {
|
||||
// TODO compile time stack upper bound detection
|
||||
lj->args.append("-STACK:16777216");
|
||||
size_t stack_size = (g->stack_size_override == 0) ? 16777216 : g->stack_size_override;
|
||||
lj->args.append(buf_ptr(buf_sprintf("-STACK:%" ZIG_PRI_usize, stack_size)));
|
||||
}
|
||||
|
||||
coff_append_machine_arg(g, &lj->args);
|
||||
|
|
23
src/main.cpp
23
src/main.cpp
|
@ -453,6 +453,7 @@ static int main0(int argc, char **argv) {
|
|||
OptionalBool linker_allow_shlib_undefined = OptionalBoolNull;
|
||||
bool linker_z_nodelete = false;
|
||||
bool linker_z_defs = false;
|
||||
size_t stack_size_override = 0;
|
||||
|
||||
ZigList<const char *> llvm_argv = {0};
|
||||
llvm_argv.append("zig (LLVM option parsing)");
|
||||
|
@ -848,6 +849,27 @@ static int main0(int argc, char **argv) {
|
|||
} else {
|
||||
fprintf(stderr, "warning: unsupported linker arg: -z %s\n", buf_ptr(z_arg));
|
||||
}
|
||||
} else if (buf_eql_str(arg, "--major-image-version")) {
|
||||
i += 1;
|
||||
if (i >= linker_args.length) {
|
||||
fprintf(stderr, "expected linker arg after '%s'\n", buf_ptr(arg));
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
ver_major = atoi(buf_ptr(linker_args.at(i)));
|
||||
} else if (buf_eql_str(arg, "--minor-image-version")) {
|
||||
i += 1;
|
||||
if (i >= linker_args.length) {
|
||||
fprintf(stderr, "expected linker arg after '%s'\n", buf_ptr(arg));
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
ver_minor = atoi(buf_ptr(linker_args.at(i)));
|
||||
} else if (buf_eql_str(arg, "--stack")) {
|
||||
i += 1;
|
||||
if (i >= linker_args.length) {
|
||||
fprintf(stderr, "expected linker arg after '%s'\n", buf_ptr(arg));
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
stack_size_override = atoi(buf_ptr(linker_args.at(i)));
|
||||
} else {
|
||||
fprintf(stderr, "warning: unsupported linker arg: %s\n", buf_ptr(arg));
|
||||
}
|
||||
|
@ -1573,6 +1595,7 @@ static int main0(int argc, char **argv) {
|
|||
g->linker_allow_shlib_undefined = linker_allow_shlib_undefined;
|
||||
g->linker_z_nodelete = linker_z_nodelete;
|
||||
g->linker_z_defs = linker_z_defs;
|
||||
g->stack_size_override = stack_size_override;
|
||||
|
||||
if (override_soname) {
|
||||
g->override_soname = buf_create_from_str(override_soname);
|
||||
|
|
Loading…
Reference in New Issue