| Index: components/nacl/loader/nacl_helper_linux.cc
|
| diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
|
| index 08df19030f9fe84c18081577801e3f59f61379eb..17a10a3aac702b35a30c43b62d480e9abac25b39 100644
|
| --- a/components/nacl/loader/nacl_helper_linux.cc
|
| +++ b/components/nacl/loader/nacl_helper_linux.cc
|
| @@ -413,13 +413,11 @@ static const char kAsanDefaultOptionsNaCl[] =
|
| // Override the default ASan options for the NaCl helper.
|
| // __asan_default_options should not be instrumented, because it is called
|
| // before ASan is initialized.
|
| -extern "C"
|
| -__attribute__((no_sanitize_address))
|
| +extern "C" __attribute__((no_sanitize_address))
|
| // The function isn't referenced from the executable itself. Make sure it isn't
|
| // stripped by the linker.
|
| -__attribute__((used))
|
| -__attribute__((visibility("default")))
|
| -const char* __asan_default_options() {
|
| +__attribute__((used)) __attribute__((visibility("default"))) const char*
|
| +__asan_default_optionsx() {
|
| return kAsanDefaultOptionsNaCl;
|
| }
|
| #endif
|
|
|