commit f2466a56825cb1b3fa74fc786ba85ec482b33d96
author Shih-wei Liao <sliao@google.com> Mon Sep 24 23:35:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 23:35:35 2012 -0700
tree eac9528146d704936ff2b8208319f674e2c74dc1
parent f0c8a70c572b1f89a998ce9dec1db24ce7bc67cd
parent d16cf282c82b92062ba28a3d99a96e384f7dad6b

Merge "Pass -z {relro,now,noexecstack} in ABCCompilerDriver."

lib/AndroidBitcode/ABCCompilerDriver.cpp

diff --git a/lib/AndroidBitcode/ABCCompilerDriver.cpp b/lib/AndroidBitcode/ABCCompilerDriver.cpp
index 5be45ec..1e5e906 100644
--- a/lib/AndroidBitcode/ABCCompilerDriver.cpp
+++ b/lib/AndroidBitcode/ABCCompilerDriver.cpp
@@ -117,6 +117,11 @@
   // -Bsymbolic.
   mLinkerConfig->setBsymbolic(true);
 
+  // Set kRelro for -z relro
+  // Not set kExecStack for -z noexecstack
+  // Not set kLazy for -z now
+  mLinkerConfig->setZOption(LinkerConfig::kRelro);
+
   // Config the linker.
   Linker::ErrorCode result = mLinker.config(*mLinkerConfig);
   if (result != Linker::kSuccess) {