force stat() instead of stat64() on 32-bit -- --- a/xpcom/io/nsLocalFileUnix.h +++ b/xpcom/io/nsLocalFileUnix.h @@ -21,7 +21,7 @@ // stat64 and lstat64 are deprecated on OS X. Normal stat and lstat are // 64-bit by default on OS X 10.6+. -#if defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && !defined(XP_DARWIN) +#if 0 && defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && !defined(XP_DARWIN) # if defined(AIX) # if defined STAT # undef STAT --- a/mozglue/baseprofiler/core/shared-libraries-linux.cc +++ b/mozglue/baseprofiler/core/shared-libraries-linux.cc @@ -178,7 +178,7 @@ return false; } -#if defined(__x86_64__) || defined(__aarch64__) || \ +#if 1 || defined(__x86_64__) || defined(__aarch64__) || \ (defined(__mips__) && _MIPS_SIM == _ABI64) || \ !(defined(GP_OS_linux) || defined(GP_OS_android)) --- a/security/sandbox/linux/broker/SandboxBrokerUtils.h +++ b/security/sandbox/linux/broker/SandboxBrokerUtils.h @@ -15,7 +15,7 @@ // calls. We'll intercept those and handle them in the stat functions // but must be sure to use the right structure layout. -#if defined(__NR_stat64) || defined(__NR_fstatat64) +#if 0 && (defined(__NR_stat64) || defined(__NR_fstatat64) ) typedef struct stat64 statstruct; # define statsyscall stat64 # define lstatsyscall lstat64