From 5dbd42aeaf86bb3d90cde78d9d812466ae49b28b Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Wed, 25 Sep 2019 07:06:50 +0000 Subject: [PATCH] [Driver] Always use -z separate-loadable-segments with lld on Fuchsia The option was added to lld in D67481/372807. Reviewed By: phosek Differential Revision: https://reviews.llvm.org/D68009 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372814 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains/Fuchsia.cpp | 2 +- test/Driver/fuchsia.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Driver/ToolChains/Fuchsia.cpp b/lib/Driver/ToolChains/Fuchsia.cpp index cb84499320..e7d38ff9f2 100644 --- a/lib/Driver/ToolChains/Fuchsia.cpp +++ b/lib/Driver/ToolChains/Fuchsia.cpp @@ -52,7 +52,7 @@ void fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-z"); CmdArgs.push_back("rodynamic"); CmdArgs.push_back("-z"); - CmdArgs.push_back("separate-code"); + CmdArgs.push_back("separate-loadable-segments"); } if (!D.SysRoot.empty()) diff --git a/test/Driver/fuchsia.c b/test/Driver/fuchsia.c index ec664fb3b5..bf8e5a04dc 100644 --- a/test/Driver/fuchsia.c +++ b/test/Driver/fuchsia.c @@ -16,7 +16,7 @@ // CHECK: "-fsanitize=safe-stack" // CHECK: "-stack-protector" "2" // CHECK: "-fno-common" -// CHECK: {{.*}}ld.lld{{.*}}" "-z" "rodynamic" "-z" "separate-code" +// CHECK: {{.*}}ld.lld{{.*}}" "-z" "rodynamic" "-z" "separate-loadable-segments" // CHECK: "--sysroot=[[SYSROOT]]" // CHECK: "-pie" // CHECK: "--build-id" -- 2.50.1