From d4df0e1a22e5a699448dd0b37420822a6c2630e3 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 24 Jun 2014 22:16:25 -0400 Subject: [PATCH] Bug 598615 - Rename HAVE_64BIT_OS to HAVE_64BIT_BUILD. r=ted --- b2g/installer/package-manifest.in | 2 +- browser/app/profile/firefox.js | 2 +- browser/confvars.sh | 2 +- browser/installer/windows/nsis/defines.nsi.in | 4 ++-- browser/installer/windows/nsis/installer.nsi | 2 +- browser/installer/windows/nsis/stub.nsi | 6 +++--- .../installer/windows/nsis/uninstaller.nsi | 2 +- build/autoconf/ffi.m4 | 4 ++-- build/gyp.mozbuild | 2 +- build/pgo/profileserver.py | 2 +- config/config.mk | 4 ++-- configure.in | 16 +++++++-------- ipc/chromium/src/base/pickle.cc | 2 +- js/src/configure.in | 12 +++++------ security/build/Makefile.in | 6 +++--- toolkit/mozapps/installer/packager.py | 2 +- .../mozapps/installer/windows/nsis/common.nsh | 20 +++++++++---------- xpcom/reflect/xptcall/src/md/unix/Makefile.in | 4 ++-- xpcom/reflect/xptcall/src/md/unix/moz.build | 6 +++--- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in index d76962c45499..4f1abba48dc2 100644 --- a/b2g/installer/package-manifest.in +++ b/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 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index f3117d4e0689..33aca7683b34 100644 --- a/browser/app/profile/firefox.js +++ b/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 diff --git a/browser/confvars.sh b/browser/confvars.sh index 307b47f7be05..88ff0872a2d0 100755 --- a/browser/confvars.sh +++ b/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 \ diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index ca94e44af879..e0ca77b42142 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/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 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index fe5234ccd96c..96e7f4ea2a41 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/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}\" diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi index 72fdb5e89d65..6738f5b3133f 100644 --- a/browser/installer/windows/nsis/stub.nsi +++ b/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" diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi index 70bd88f4bf51..26f4ede4a4fc 100755 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/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}\" diff --git a/build/autoconf/ffi.m4 b/build/autoconf/ffi.m4 index 35dce095bb9b..6bca716c8fe3 100644 --- a/build/autoconf/ffi.m4 +++ b/build/autoconf/ffi.m4 @@ -71,7 +71,7 @@ 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=" @@ -79,7 +79,7 @@ if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then 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" diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index 001cce6cd084..e602121b42e3 100644 --- a/build/gyp.mozbuild +++ b/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': diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py index a02e5b26bc04..473f7074d3ba 100644 --- a/build/pgo/profileserver.py +++ b/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): diff --git a/config/config.mk b/config/config.mk index b2ab934c8c9a..b6df7a93b5ad 100644 --- a/config/config.mk +++ b/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 diff --git a/configure.in b/configure.in index 6a5efe44f609..c8511e3eef0c 100644 --- a/configure.in +++ b/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 diff --git a/ipc/chromium/src/base/pickle.cc b/ipc/chromium/src/base/pickle.cc index 582d6af0c24d..f4cc89b89396 100644 --- a/ipc/chromium/src/base/pickle.cc +++ b/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 struct Copier { diff --git a/js/src/configure.in b/js/src/configure.in index d0784141f7c4..82870640b2eb 100644 --- a/js/src/configure.in +++ b/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) diff --git a/security/build/Makefile.in b/security/build/Makefile.in index a764de160c60..45b0842f22f8 100644 --- a/security/build/Makefile.in +++ b/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) diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py index 88dbf2b3b872..b51152d6bc55 100644 --- a/toolkit/mozapps/installer/packager.py +++ b/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): diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 9a29609b0cc0..eabb02f92c85 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/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" diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index e87e11a8b1c8..80dc57011c4e 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/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 diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build index ea94dc996b6e..ae0486295d43 100644 --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -179,7 +179,7 @@ if CONFIG['OS_ARCH'] == 'Linux': ] if CONFIG['OS_ARCH'] == 'AIX': - if CONFIG['HAVE_64BIT_OS']: + if CONFIG['HAVE_64BIT_BUILD']: SOURCES += [ 'xptcinvoke_asm_ppc_aix64.s', 'xptcinvoke_ppc_aix64.cpp', @@ -276,7 +276,7 @@ if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1: GENERATED_FILES = [ 'xptcstubsdef_asm.solx86', ] - if CONFIG['HAVE_64BIT_OS']: + if CONFIG['HAVE_64BIT_BUILD']: SOURCES += [ 'xptcinvoke_sparcv9_solaris.cpp', 'xptcstubs_sparcv9_solaris.cpp', @@ -292,7 +292,7 @@ if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1: 'xptcstubs_asm_sparc_solaris.s', ] else: - if CONFIG['HAVE_64BIT_OS']: + if CONFIG['HAVE_64BIT_BUILD']: SOURCES += [ 'xptcinvoke_asm_sparcv9_solaris_SUNW.s', 'xptcstubs_asm_sparcv9_solaris.s',