diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 13:55:43 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 13:55:43 +0000 |
| commit | 789f70c794486cdb8de229e825332a43e20630fe (patch) | |
| tree | 91a8373b4eea37eab3482dfa0feab4b00a60dd43 /chrome/browser/zygote_main_linux.cc | |
| parent | ffcf6635f96fdb99b0a301d20514306bc83586c0 (diff) | |
| download | chromium_src-789f70c794486cdb8de229e825332a43e20630fe.zip chromium_src-789f70c794486cdb8de229e825332a43e20630fe.tar.gz chromium_src-789f70c794486cdb8de229e825332a43e20630fe.tar.bz2 | |
Hide ia32 asm when not building for ARCH_CPU_X86_FAMILY
r21097, 'Linux sandbox: plumb timezone calls through the sandbox' adds some
ia32 assembly by the way of a define. This is bad for building for ARM.
Patch by Joel Stanley.
Review URL: http://codereview.chromium.org/160097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_main_linux.cc')
| -rw-r--r-- | chrome/browser/zygote_main_linux.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc index e59946c..4da9bfe 100644 --- a/chrome/browser/zygote_main_linux.cc +++ b/chrome/browser/zygote_main_linux.cc @@ -10,6 +10,7 @@ #include <sys/prctl.h> #include <sys/wait.h> +#include "base/basictypes.h" #include "base/command_line.h" #include "base/eintr_wrapper.h" #include "base/global_descriptors_posix.h" @@ -309,8 +310,10 @@ static bool MaybeEnterChroot() { // files and cache the results or the descriptors. base::RandUint64(); +#if defined(ARCH_CPU_X86_FAMILY) PATCH_GLOBAL_OFFSET_TABLE(localtime, sandbox_wrapper::localtime); PATCH_GLOBAL_OFFSET_TABLE(localtime_r, sandbox_wrapper::localtime_r); +#endif static const char kChrootMe = 'C'; static const char kChrootMeSuccess = 'O'; |