Assorted fixes for 64-bit.

chrome/browser/zygote_main_linux.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <unistd.h>
 #include <sys/epoll.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/signal.h>
 #include <sys/prctl.h>
@@ skipping 300 matching lines @@
     base::RandUint64();
 
     // To make wcstombs/mbstowcs work in a renderer, setlocale() has to be
     // called before the sandbox is triggered. It's possible to avoid calling
     // setlocale() by pulling out the conversion between FilePath and
     // WebCore String out of the renderer and using string16 in place of
     // FilePath for IPC.
     const char* locale = setlocale(LC_ALL, "");
     LOG_IF(WARNING, locale == NULL) << "setlocale failed.";
 
-#if defined(ARCH_CPU_X86_FAMILY)
+#if defined(ARCH_CPU_X86)
     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';
 
     if (HANDLE_EINTR(write(fd, &kChrootMe, 1)) != 1) {
       LOG(ERROR) << "Failed to write to chroot pipe: " << errno;
       return false;
@@ skipping 50 matching lines @@
 bool ZygoteMain(const MainFunctionParams& params) {
   if (!MaybeEnterChroot()) {
     LOG(FATAL) << "Failed to enter sandbox. Fail safe abort. (errno: "
                << errno << ")";
     return false;
   }
 
   Zygote zygote;
   return zygote.ProcessRequests();
 }