Bug 598615 - Rename HAVE_64BIT_OS to HAVE_64BIT_BUILD. r=ted

b2g/installer/package-manifest.in

@@ -597,7 +597,7 @@
 
 ; ANGLE on Win32
 #ifdef XP_WIN32
-#ifndef HAVE_64BIT_OS
+#ifndef HAVE_64BIT_BUILD
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 #endif

browser/app/profile/firefox.js

@@ -218,7 +218,7 @@ pref("app.update.incompatible.mode", 0);
 
 // Whether or not to attempt using the service for updates.
 #ifdef MOZ_MAINTENANCE_SERVICE
-#ifndef HAVE_64BIT_OS
+#ifndef HAVE_64BIT_BUILD
 pref("app.update.service.enabled", true);
 #endif
 #endif

browser/confvars.sh

@@ -10,7 +10,7 @@ MOZ_PHOENIX=1
 
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
-  if ! test "$HAVE_64BIT_OS"; then
+  if ! test "$HAVE_64BIT_BUILD"; then
     MOZ_VERIFY_MAR_SIGNATURE=1
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \

browser/installer/windows/nsis/defines.nsi.in

@@ -61,8 +61,8 @@
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
-#ifdef HAVE_64BIT_OS
-!define HAVE_64BIT_OS
+#ifdef HAVE_64BIT_BUILD
+!define HAVE_64BIT_BUILD
 !define ARCH "x64"
 !define MinSupportedVer "Microsoft Windows Vista x64"
 #else

browser/installer/windows/nsis/installer.nsi

@@ -126,7 +126,7 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 
 Name "${BrandFullName}"
 OutFile "setup.exe"
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
   InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 !else
   InstallDir "$PROGRAMFILES32\${BrandFullName}\"

browser/installer/windows/nsis/stub.nsi

@@ -269,7 +269,7 @@ icon "setup.ico"
 XPStyle on
 BrandingText " "
 ChangeUI all "nsisui.exe"
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
   InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 !else
   InstallDir "$PROGRAMFILES32\${BrandFullName}\"
@@ -310,7 +310,7 @@ Function .onInit
   ; isn't supported for the stub installer.
   ${SetBrandNameVars} "$PLUGINSDIR\ignored.ini"
 
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
   ; Restrict x64 builds from being installed on x86 and pre Vista
   ${Unless} ${RunningX64}
   ${OrUnless} ${AtLeastWinVista}
@@ -561,7 +561,7 @@ Function SendPing
     ; completion of all phases.
     ${GetSecondsElapsed} "$EndInstallPhaseTickCount" "$EndFinishPhaseTickCount" $4
 
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
     StrCpy $R0 "1"
 !else
     StrCpy $R0 "0"

browser/installer/windows/nsis/uninstaller.nsi

@@ -128,7 +128,7 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
 
 Name "${BrandFullName}"
 OutFile "helper.exe"
-!ifdef HAVE_64BIT_OS
+!ifdef HAVE_64BIT_BUILD
   InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 !else
   InstallDir "$PROGRAMFILES32\${BrandFullName}\"

build/autoconf/ffi.m4

@@ -71,15 +71,15 @@ if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
     fi
     if test "$SOLARIS_SUNPRO_CC"; then
       # Always use gcc for libffi on Solaris
-      if test ! "$HAVE_64BIT_OS"; then
+      if test ! "$HAVE_64BIT_BUILD"; then
         ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-m32 LD= LDFLAGS="
       else
         ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-m64 LD= LDFLAGS="
       fi
     fi
     if test "$AIX_IBM_XLC"; then
       # Always use gcc for libffi on IBM AIX5/AIX6
-      if test ! "$HAVE_64BIT_OS"; then
+      if test ! "$HAVE_64BIT_BUILD"; then
         ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-maix32"
       else
         ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-maix64"

build/gyp.mozbuild

@@ -59,7 +59,7 @@ os = CONFIG['OS_TARGET']
 if os == 'WINNT':
     gyp_vars.update(
         MSVS_VERSION=CONFIG['_MSVS_VERSION'],
-        MSVS_OS_BITS=64 if CONFIG['HAVE_64BIT_OS'] else 32,
+        MSVS_OS_BITS=64 if CONFIG['HAVE_64BIT_BUILD'] else 32,
     )
 elif os == 'Android':
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

build/pgo/profileserver.py

@@ -57,7 +57,7 @@
     env["XPCOM_DEBUG_BREAK"] = "warn"
 
     # For VC12, make sure we can find the right bitness of pgort120.dll
-    if "VS120COMNTOOLS" in env and not substs["HAVE_64BIT_OS"]:
+    if "VS120COMNTOOLS" in env and not substs["HAVE_64BIT_BUILD"]:
       vc12dir = os.path.abspath(os.path.join(env["VS120COMNTOOLS"],
                                              "../../VC/bin"))
       if os.path.exists(vc12dir):

config/config.mk

@@ -295,7 +295,7 @@ else # ! MOZ_DEBUG
 ifdef MOZ_DEBUG_SYMBOLS
 OS_CXXFLAGS += -UDEBUG -DNDEBUG
 OS_CFLAGS += -UDEBUG -DNDEBUG
-ifdef HAVE_64BIT_OS
+ifdef HAVE_64BIT_BUILD
 OS_LDFLAGS += -DEBUG -OPT:REF,ICF
 else
 OS_LDFLAGS += -DEBUG -OPT:REF
@@ -308,7 +308,7 @@ endif
 #
 ifneq (,$(NS_TRACE_MALLOC)$(MOZ_DMD))
 MOZ_OPTIMIZE_FLAGS=-Zi -Od -UDEBUG -DNDEBUG
-ifdef HAVE_64BIT_OS
+ifdef HAVE_64BIT_BUILD
 OS_LDFLAGS = -DEBUG -OPT:REF,ICF
 else
 OS_LDFLAGS = -DEBUG -OPT:REF

configure.in

@@ -1590,10 +1590,10 @@ AC_TRY_COMPILE([$configure_static_assert_macros],
                result="yes", result="no")
 AC_MSG_RESULT("$result")
 if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_64BIT_OS)
-    HAVE_64BIT_OS=1
+    AC_DEFINE(HAVE_64BIT_BUILD)
+    HAVE_64BIT_BUILD=1
 fi
-AC_SUBST(HAVE_64BIT_OS)
+AC_SUBST(HAVE_64BIT_BUILD)
 AC_LANG_RESTORE
 fi # COMPILE_ENVIRONMENT
 
@@ -1830,7 +1830,7 @@ case "$target" in
 *-aix*)
     AC_DEFINE(AIX)
     if test ! "$GNU_CC"; then
-        if test ! "$HAVE_64BIT_OS"; then
+        if test ! "$HAVE_64BIT_BUILD"; then
             # Compiling with Visual Age C++ object model compat is the
             # default. To compile with object model ibm, add
             # AIX_OBJMODEL=ibm to .mozconfig.
@@ -1887,7 +1887,7 @@ case "$target" in
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MOZ_OPTIMIZE_FLAGS="-O3"
     # Statically disable jemalloc on 10.5 and 32-bit 10.6.  See bug 702250.
-    if test "$HAVE_64BIT_OS"; then
+    if test "$HAVE_64BIT_BUILD"; then
         MOZ_MEMORY=1
     fi
     DLL_SUFFIX=".dylib"
@@ -2231,7 +2231,7 @@ ia64*-hpux*)
 
     case "$target" in
     i*86-*)
-        if test "$HAVE_64BIT_OS"; then
+        if test "$HAVE_64BIT_BUILD"; then
             AC_MSG_ERROR([You are targeting i386 but using the 64-bit compiler.])
         fi
 
@@ -6008,7 +6008,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
   fi
 
   if test "$OS_ARCH" = "WINNT"; then
-    if test -z "$HAVE_64BIT_OS"; then
+    if test -z "$HAVE_64BIT_BUILD"; then
       MOZ_CRASHREPORTER_INJECTOR=1
       AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
     fi
@@ -9149,7 +9149,7 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     elif test -z "$MOZ_OPTIMIZE"; then
         ac_configure_args="$ac_configure_args --disable-optimize"
     fi
-    if test -n "$HAVE_64BIT_OS"; then
+    if test -n "$HAVE_64BIT_BUILD"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     if test -n "$USE_ARM_KUSER"; then

ipc/chromium/src/base/pickle.cc

@@ -53,7 +53,7 @@ struct Copier
 // worthwhile on 32-bit platforms, so handle it specially.  Only do it
 // if 64-bit types aren't sufficiently aligned; the alignment
 // requirements for them vary between 32-bit platforms.
-#ifndef HAVE_64BIT_OS
+#ifndef HAVE_64BIT_BUILD
 template<typename T>
 struct Copier<T, sizeof(uint64_t), false>
 {

js/src/configure.in

@@ -1316,10 +1316,10 @@ AC_TRY_COMPILE([$configure_static_assert_macros],
                result="yes", result="no")
 AC_MSG_RESULT("$result")
 if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_64BIT_OS)
-    HAVE_64BIT_OS=1
+    AC_DEFINE(HAVE_64BIT_BUILD)
+    HAVE_64BIT_BUILD=1
 fi
-AC_SUBST(HAVE_64BIT_OS)
+AC_SUBST(HAVE_64BIT_BUILD)
 AC_LANG_RESTORE
 fi # COMPILE_ENVIRONMENT
 
@@ -1407,7 +1407,7 @@ case "$target" in
 *-aix*)
     AC_DEFINE(AIX)
     if test ! "$GNU_CC"; then
-        if test ! "$HAVE_64BIT_OS"; then
+        if test ! "$HAVE_64BIT_BUILD"; then
             # Compiling with Visual Age C++ object model compat is the
             # default. To compile with object model ibm, add
             # AIX_OBJMODEL=ibm to .mozconfig.
@@ -1749,7 +1749,7 @@ ia64*-hpux*)
 
     case "$target" in
     i*86-*)
-        if test "$HAVE_64BIT_OS"; then
+        if test "$HAVE_64BIT_BUILD"; then
             AC_MSG_ERROR([You are targeting i386 but using the 64-bit compiler.])
         fi
 
@@ -1996,7 +1996,7 @@ arm*-*)
     AC_DEFINE(JS_NUNBOX32)
     ;;
 sparc*-*)
-    if test ! "$HAVE_64BIT_OS" ; then
+    if test ! "$HAVE_64BIT_BUILD" ; then
 dnl ENABLE_ION=0
     AC_DEFINE(JS_CPU_SPARC)
     AC_DEFINE(JS_NUNBOX32)

security/build/Makefile.in

@@ -44,7 +44,7 @@ HAVE_FREEBL_LIBS = 1
 # 32-bit HP-UX PA-RISC
 ifeq ($(OS_ARCH), HP-UX)
 ifneq ($(OS_TEST), ia64)
-ifndef HAVE_64BIT_OS
+ifndef HAVE_64BIT_BUILD
 HAVE_FREEBL_LIBS =
 HAVE_FREEBL_LIBS_32INT32 = 1
 HAVE_FREEBL_LIBS_32FPU = 1
@@ -55,7 +55,7 @@ endif
 # SunOS SPARC
 ifeq ($(OS_ARCH), SunOS)
 ifneq (86,$(findstring 86,$(OS_TEST)))
-ifdef HAVE_64BIT_OS
+ifdef HAVE_64BIT_BUILD
 HAVE_FREEBL_LIBS =
 HAVE_FREEBL_LIBS_64 = 1
 else
@@ -159,7 +159,7 @@ ifdef USE_N32
 # merely adds _PTH to coreconf's OBJDIR name.
 DEFAULT_GMAKE_FLAGS += USE_N32=1 USE_PTHREADS=1
 endif
-ifdef HAVE_64BIT_OS
+ifdef HAVE_64BIT_BUILD
 DEFAULT_GMAKE_FLAGS += USE_64=1
 endif
 ifeq ($(OS_ARCH),WINNT)

toolkit/mozapps/installer/packager.py

@@ -140,7 +140,7 @@ def precompile_cache(formatter, source_path, gre_path, app_path):
 
     # For VC12, make sure we can find the right bitness of pgort120.dll
     env = os.environ.copy()
-    if 'VS120COMNTOOLS' in env and not buildconfig.substs['HAVE_64BIT_OS']:
+    if 'VS120COMNTOOLS' in env and not buildconfig.substs['HAVE_64BIT_BUILD']:
       vc12dir = os.path.abspath(os.path.join(env['VS120COMNTOOLS'],
                                              '../../VC/bin'))
       if os.path.exists(vc12dir):

toolkit/mozapps/installer/windows/nsis/common.nsh

@@ -957,7 +957,7 @@
 !ifndef KEY_WOW64_64KEY
   !define KEY_WOW64_64KEY 0x0100
 !endif
-!ifndef HAVE_64BIT_OS
+!ifndef HAVE_64BIT_BUILD
   !define CREATE_KEY_SAM ${KEY_SET_VALUE}
 !else
   !define CREATE_KEY_SAM ${KEY_SET_VALUE}|${KEY_WOW64_64KEY}
@@ -2527,7 +2527,7 @@
         ; Set the registry to the 32 bit registry for 64 bit installations or to
         ; the 64 bit registry for 32 bit installations at the beginning so it can
         ; easily be set back to the correct registry view when finished.
-        !ifdef HAVE_64BIT_OS
+        !ifdef HAVE_64BIT_BUILD
           SetRegView 32
         !else
           SetRegView 64
@@ -2584,7 +2584,7 @@
       ${If} ${RunningX64}
       ${AndIf} "$R0" == "false"
         ; Set the registry to the correct view.
-        !ifdef HAVE_64BIT_OS
+        !ifdef HAVE_64BIT_BUILD
           SetRegView 64
         !else
           SetRegView 32
@@ -2693,7 +2693,7 @@
         ; Set the registry to the 32 bit registry for 64 bit installations or to
         ; the 64 bit registry for 32 bit installations at the beginning so it can
         ; easily be set back to the correct registry view when finished.
-        !ifdef HAVE_64BIT_OS
+        !ifdef HAVE_64BIT_BUILD
           SetRegView 32
         !else
           SetRegView 64
@@ -2720,7 +2720,7 @@
       ${If} ${RunningX64}
       ${AndIf} "$R3" == "false"
         ; Set the registry to the correct view.
-        !ifdef HAVE_64BIT_OS
+        !ifdef HAVE_64BIT_BUILD
           SetRegView 64
         !else
           SetRegView 32
@@ -5037,7 +5037,7 @@
       Push $R6
       Push $R5
 
-      !ifdef HAVE_64BIT_OS
+      !ifdef HAVE_64BIT_BUILD
         ${Unless} ${RunningX64}
         ${OrUnless} ${AtLeastWinVista}
           MessageBox MB_OK|MB_ICONSTOP "$R9" IDOK
@@ -5114,7 +5114,7 @@
             SetSilent silent
             ReadINIStr $R8 $R7 "Install" "InstallDirectoryName"
             ${If} $R8 != ""
-              !ifdef HAVE_64BIT_OS
+              !ifdef HAVE_64BIT_BUILD
                 StrCpy $INSTDIR "$PROGRAMFILES64\$R8"
               !else
                 StrCpy $INSTDIR "$PROGRAMFILES32\$R8"
@@ -5267,7 +5267,7 @@
       Reboot
       Quit ; Nothing initialized so no need to call OnEndCommon
 
-      !ifdef HAVE_64BIT_OS
+      !ifdef HAVE_64BIT_BUILD
         SetRegView 64
       !endif
 
@@ -5442,7 +5442,7 @@
         Abort
       ${EndUnless}
 
-      !ifdef HAVE_64BIT_OS
+      !ifdef HAVE_64BIT_BUILD
         SetRegView 64
       !endif
 
@@ -6067,7 +6067,7 @@
         ${LogMsg} "OS Name    : Unable to detect"
       ${EndIf}
 
-      !ifdef HAVE_64BIT_OS
+      !ifdef HAVE_64BIT_BUILD
         ${LogMsg} "Target CPU : x64"
       !else
         ${LogMsg} "Target CPU : x86"

xpcom/reflect/xptcall/src/md/unix/Makefile.in

@@ -60,7 +60,7 @@ endif
 #
 ifeq ($(OS_ARCH),SunOS)
 ifneq (86,$(findstring 86,$(OS_TEST)))
-ifdef HAVE_64BIT_OS
+ifdef HAVE_64BIT_BUILD
 ASFLAGS		+= -xarch=v9
 endif
 endif
@@ -80,7 +80,7 @@ xptcstubs_asm_ppc_darwin.s: xptcstubs_asm_ppc_darwin.s.m4 $(DIST)/include/xptcst
 endif
 
 ifeq ($(OS_ARCH),AIX)
-ifdef HAVE_64BIT_OS
+ifdef HAVE_64BIT_BUILD
 xptcstubs_asm_ppc_aix64.s: xptcstubs_asm_ppc_aix64.s.m4 $(DIST)/include/xptcstubsdef.inc Makefile
 	m4 -DAIX_OBJMODEL=$(AIX_OBJMODEL) $(INCLUDES) -I. $< > $@
 else