diff options
| author | Dan Albert <danalbert@google.com> | 2018-10-11 20:57:54 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-10-11 20:57:54 +0000 |
| commit | e4dd75a9cb074208ee4085771956e726e5e9533e (patch) | |
| tree | 3dff922a0cd551e3834bbed5f229a1f8e1728d81 /clang | |
| parent | 2600e0946b79626de11f2b63d83c6bb110b60d4f (diff) | |
| download | bcm5719-llvm-e4dd75a9cb074208ee4085771956e726e5e9533e.tar.gz bcm5719-llvm-e4dd75a9cb074208ee4085771956e726e5e9533e.zip | |
[Driver] Default to `-z now` and `-z relro` on Android.
Summary:
RTLD_LAZY is not supported on Android (though failing to use `-z now`
will work since it is assumed by the loader).
RelRO is required.
Reviewers: srhines, pirama
Reviewed By: srhines
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D53117
llvm-svn: 344295
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Linux.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Driver/linux-ld.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index fc511013cd0..7df3da1c839 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -229,12 +229,13 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) Distro Distro(D.getVFS()); - if (Distro.IsAlpineLinux()) { + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("now"); } - if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) { + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || + Triple.isAndroid()) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c index cb530216fe6..6ecbd40af98 100644 --- a/clang/test/Driver/linux-ld.c +++ b/clang/test/Driver/linux-ld.c @@ -1255,6 +1255,8 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s // CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" +// CHECK-ANDROID: "-z" "now" +// CHECK-ANDROID: "-z" "relro" // CHECK-ANDROID: "--enable-new-dtags" // CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o" // CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib" |
