This is an archive of the discontinued LLVM Phabricator instance.

Differential D53117

[Driver] Default to `-z now` and `-z relro` on Android.
ClosedPublic

Authored by danalbert on Oct 10 2018, 5:19 PM.

Details

Reviewers
srhines
pirama
Commits
rGe4dd75a9cb07: [Driver] Default to `-z now` and `-z relro` on Android.
rL344295: [Driver] Default to `-z now` and `-z relro` on Android.
rC344295: [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.
Diff Detail
Repository 
rC Clang 
Event Timeline
danalbert created this revision.Oct 10 2018, 5:19 PM
srhines accepted this revision.Oct 10 2018, 6:25 PM
This revision is now accepted and ready to land.Oct 10 2018, 6:25 PM
Closed by commit rC344295: [Driver] Default to `-z now` and `-z relro` on Android. (authored by danalbert).  ·  Explain WhyOct 11 2018, 1:59 PM
This revision was automatically updated to reflect the committed changes.
Revision Contents
PathSize
lib/
Driver/
ToolChains/
5 lines
test/
Driver/
2 lines
Diff 169300
lib/Driver/ToolChains/Linux.cpp
Show First 20 Lines • Show All 223 Lines • ▼ Show 20 LinesLinux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)

  // FIXME: This seems unlikely to be Linux-specific.
  // FIXME: This seems unlikely to be Linux-specific.

  ToolChain::path_list &PPaths = getProgramPaths();
  ToolChain::path_list &PPaths = getProgramPaths();

  PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
  PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +

                         GCCInstallation.getTriple().str() + "/bin")
                         GCCInstallation.getTriple().str() + "/bin")

                       .str());
                       .str());




  Distro Distro(D.getVFS());
  Distro Distro(D.getVFS());




  if (Distro.IsAlpineLinux()) {
  if (Distro.IsAlpineLinux() || Triple.isAndroid()) {

    ExtraOpts.push_back("-z");
    ExtraOpts.push_back("-z");

    ExtraOpts.push_back("now");
    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("-z");

    ExtraOpts.push_back("relro");
    ExtraOpts.push_back("relro");

  }
  }




  if (GCCInstallation.getParentLibPath().find("opt/rh/devtoolset") !=
  if (GCCInstallation.getParentLibPath().find("opt/rh/devtoolset") !=

      StringRef::npos)
      StringRef::npos)

    // With devtoolset on RHEL, we want to add a bin directory that is relative
    // With devtoolset on RHEL, we want to add a bin directory that is relative

    // to the detected gcc install, because if we are using devtoolset gcc then
    // to the detected gcc install, because if we are using devtoolset gcc then

▲ Show 20 Lines • Show All 727 Lines • Show Last 20 Lines
test/Driver/linux-ld.c
Show First 20 Lines • Show All 1,249 Lines • ▼ Show 20 Lines
// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \

// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s

// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \

// RUN:     --target=x86_64-linux-android -rtlib=platform \
// RUN:     --target=x86_64-linux-android -rtlib=platform \

// RUN:     --gcc-toolchain="" \
// RUN:     --gcc-toolchain="" \

// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \

// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s

// CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"

// CHECK-ANDROID: "-z" "now"

// CHECK-ANDROID: "-z" "relro"

// CHECK-ANDROID: "--enable-new-dtags"
// CHECK-ANDROID: "--enable-new-dtags"

// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"

// CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib"
// CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib"

// CHECK-ANDROID-NOT: "gcc_s"
// CHECK-ANDROID-NOT: "gcc_s"

// CHECK-ANDROID: "-lgcc"
// CHECK-ANDROID: "-lgcc"

// CHECK-ANDROID: "-ldl"
// CHECK-ANDROID: "-ldl"

// CHECK-ANDROID-NOT: "gcc_s"
// CHECK-ANDROID-NOT: "gcc_s"

// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o"
// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o"

▲ Show 20 Lines • Show All 717 Lines • Show Last 20 Lines