diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 04:02:49 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 04:02:49 +0000 |
| commit | 2090c52bd289204420d1291acd9fa388222446d7 (patch) | |
| tree | c8d108c27665bb17a315fab63210757f13da312b /base/location.cc | |
| parent | d9e05a39e1aba1bf47f72c705626124271ff046d (diff) | |
| download | chromium_src-2090c52bd289204420d1291acd9fa388222446d7.zip chromium_src-2090c52bd289204420d1291acd9fa388222446d7.tar.gz chromium_src-2090c52bd289204420d1291acd9fa388222446d7.tar.bz2 | |
Fixes in base for [P]NaCl port of remoting client
Various minor fixes in base needed for [P]NaCl port of remoting client:
- added base_i18n_untrusted target
- md5 is included in base_untrusted.
- base/metrics is compiled in base_untrusted (src/net depends on it).
- enabled PNaCl build of base_untrusted
- __builtin_extract_return_addr() is not allowed in PNaCl (validator
rejects it).
- sys_byteorder.h now works in NaCl.
BUG=276739
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=242270
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/116803005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/location.cc')
| -rw-r--r-- | base/location.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/location.cc b/base/location.cc index b5da027..d87ed35 100644 --- a/base/location.cc +++ b/base/location.cc @@ -92,10 +92,9 @@ __declspec(noinline) BASE_EXPORT const void* GetProgramCounter() { #if defined(COMPILER_MSVC) return _ReturnAddress(); -#elif defined(COMPILER_GCC) +#elif defined(COMPILER_GCC) && !defined(OS_NACL) return __builtin_extract_return_addr(__builtin_return_address(0)); #endif // COMPILER_GCC - return NULL; } |