authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-28 02:16:09-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-03-28 02:16:09-04:00
log12e1c6e21c1d21238450903ad7f8fa4ce52ee758
tree2587aaed8b2ac5509650615107d41459f58618fe
parent69aa09948b2463076ef22a550cb5d2483730ecaf
parente7847f8d42ce30dfb79d030836d3432e1bb71fdf
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4835 from squeek502/export-dynamic

-rdynamic/--export-dynamic fixes

2 files changed, 9 insertions(+), 0 deletions(-)

src/link.cpp+4
...@@ -1775,6 +1775,10 @@ static void construct_linker_job_elf(LinkJob *lj) {...@@ -1775,6 +1775,10 @@ static void construct_linker_job_elf(LinkJob *lj) {
1775 lj->args.append("--eh-frame-hdr");1775 lj->args.append("--eh-frame-hdr");
1776 }1776 }
17771777
1778 if (g->linker_rdynamic) {
1779 lj->args.append("--export-dynamic");
1780 }
1781
1778 lj->args.append("-m");1782 lj->args.append("-m");
1779 lj->args.append(getLDMOption(g->zig_target));1783 lj->args.append(getLDMOption(g->zig_target));
17801784
src/main.cpp+5
...@@ -790,6 +790,11 @@ static int main0(int argc, char **argv) {...@@ -790,6 +790,11 @@ static int main0(int argc, char **argv) {
790 return EXIT_FAILURE;790 return EXIT_FAILURE;
791 }791 }
792 dynamic_linker = buf_ptr(linker_args.at(i));792 dynamic_linker = buf_ptr(linker_args.at(i));
793 } else if (buf_eql_str(arg, "-E") ||
794 buf_eql_str(arg, "--export-dynamic") ||
795 buf_eql_str(arg, "-export-dynamic"))
796 {
797 rdynamic = true;
793 } else {798 } else {
794 fprintf(stderr, "warning: unsupported linker arg: %s\n", buf_ptr(arg));799 fprintf(stderr, "warning: unsupported linker arg: %s\n", buf_ptr(arg));
795 }800 }