Bug 539378 - Remove MOZ_BITS macro from tree. r=ted
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 19 Jan 2010 14:12:09 +0900
changeset 37305 5db012421dfddb28046f4d3788308239d55f9835
parent 37304 3198c740b660e85f2ea7f496aa51a80e8914c386
child 37306 e6fa7005b86abe15cc16fbb7d397409313d336ff
push idunknown
push userunknown
push dateunknown
reviewersted
bugs539378
milestone1.9.3a1pre
Bug 539378 - Remove MOZ_BITS macro from tree. r=ted
config/autoconf.mk.in
configure.in
dbm/include/Makefile.win
dbm/src/Makefile.in
dbm/src/Makefile.win
dbm/tests/Makefile.in
jpeg/Makefile.in
js/jsd/Makefile.in
js/src/config/autoconf.mk.in
js/src/xpconnect/src/Makefile.in
modules/libpref/src/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -556,17 +556,16 @@ MOZ_AUTO_DEPS	= @MOZ_AUTO_DEPS@
 COMPILER_DEPEND = @COMPILER_DEPEND@
 MDDEPDIR        := @MDDEPDIR@
 
 MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
 
 # XXX - these need to be cleaned up and have real checks added -cls
 CM_BLDTYPE=dbg
 AWT_11=1
-MOZ_BITS=32
 OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
 OS_TEST=@OS_TEST@
 
 # For Solaris build
 SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
 SOLARIS_SUNPRO_CXX = @SOLARIS_SUNPRO_CXX@
--- a/configure.in
+++ b/configure.in
@@ -2235,17 +2235,17 @@ case "$target" in
             dnl XXX: should be -LTCG:PGOPTIMIZE, but that fails on libxul.
             dnl Probably also a compiler bug, but what can you do?
             PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE"
             if test -n "$_USE_DYNAMICBASE"; then
                LDFLAGS="$LDFLAGS -DYNAMICBASE"
             fi
         fi
     fi
-    MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg$(MOZ_BITS)$(VERSION_NUMBER),$(DEPTH)/jpeg)'
+    MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/jpeg)'
     MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
     AC_DEFINE(WIN32)
     AC_DEFINE(XP_WIN)
     AC_DEFINE(XP_WIN32)
     AC_DEFINE(HW_THREADS)
     AC_DEFINE(STDC_HEADERS)
--- a/dbm/include/Makefile.win
+++ b/dbm/include/Makefile.win
@@ -36,22 +36,16 @@
 
 
 #//------------------------------------------------------------------------
 #//
 #// Makefile to build the cert library
 #//
 #//------------------------------------------------------------------------
 
-!if "$(MOZ_BITS)" == "16"
-!ifndef MOZ_DEBUG
-OPTIMIZER=-Os -UDEBUG -DNDEBUG
-!endif
-!endif
-
 #//------------------------------------------------------------------------
 #//
 #// Specify the depth of the current directory relative to the
 #// root of NS
 #//
 #//------------------------------------------------------------------------
 DEPTH= ..\..
 
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -41,17 +41,17 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mozdbm_s
 LIB_IS_C_ONLY	= 1
 
 ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME	= dbm$(MOZ_BITS)
+LIBRARY_NAME	= dbm32
 endif
 
 CSRCS		= \
 		db.c \
 		h_bigkey.c \
 		h_func.c \
 		h_log2.c \
 		h_page.c \
--- a/dbm/src/Makefile.win
+++ b/dbm/src/Makefile.win
@@ -36,22 +36,16 @@
 
 
 #//------------------------------------------------------------------------
 #//
 #// Makefile to build the cert library
 #//
 #//------------------------------------------------------------------------
 
-!if "$(MOZ_BITS)" == "16"
-!ifndef MOZ_DEBUG
-OPTIMIZER=-Os -UDEBUG -DNDEBUG
-!endif
-!endif
-
 #//------------------------------------------------------------------------
 #//
 #// Specify the depth of the current directory relative to the
 #// root of NS
 #//
 #//------------------------------------------------------------------------
 DEPTH= ..\..
 
@@ -59,17 +53,17 @@ DEPTH= ..\..
 MAKE_OBJ_TYPE=EXE
 !endif
 
 #//------------------------------------------------------------------------
 #//
 #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
 #//
 #//------------------------------------------------------------------------
-LIBNAME=dbm$(MOZ_BITS)
+LIBNAME=dbm32
 PDBFILE=$(LIBNAME).pdb
 
 #//------------------------------------------------------------------------
 #// 
 #// Define the files necessary to build the target (ie. OBJS)
 #//
 #//------------------------------------------------------------------------
 OBJS=                         \
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -46,17 +46,17 @@ MODULE		= dbm
 
 PACKAGE_FILE = dbmtest.pkg
 
 PROGRAM		= lots$(BIN_SUFFIX)
 
 CSRCS		= lots.c
 
 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LIBS	= dbm$(MOZ_BITS)
+EXTRA_DSO_LIBS	= dbm32
 else
 EXTRA_DSO_LIBS	= mozdbm_s
 endif
 
 LIBS		= $(EXTRA_DSO_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/jpeg/Makefile.in
+++ b/jpeg/Makefile.in
@@ -41,17 +41,17 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= jpeg
 LIBRARY_NAME	= mozjpeg
 
 ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME	= jpeg$(MOZ_BITS)$(VERSION_NUMBER)
+LIBRARY_NAME	= jpeg32$(VERSION_NUMBER)
 # FIXME: bug 413019
 ifndef GNU_CC
 OS_COMPILE_CFLAGS += -GL-
 endif
 endif
 
 GRE_MODULE	= 1
 
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -44,17 +44,17 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= jsdebug
 LIBRARY_NAME	= jsd
 FORCE_SHARED_LIB= 1
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
-LIBRARY_NAME	= jsd$(MOZ_BITS)$(VERSION_NUMBER)
+LIBRARY_NAME	= jsd32$(VERSION_NUMBER)
 endif
 
 # REQUIRES	= java js
 
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -291,17 +291,16 @@ MOZ_AUTO_DEPS	= @MOZ_AUTO_DEPS@
 COMPILER_DEPEND = @COMPILER_DEPEND@
 MDDEPDIR        := @MDDEPDIR@
 
 MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
 
 # XXX - these need to be cleaned up and have real checks added -cls
 CM_BLDTYPE=dbg
 AWT_11=1
-MOZ_BITS=32
 OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
 OS_TEST=@OS_TEST@
 
 # For Solaris build
 SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
 SOLARIS_SUNPRO_CXX = @SOLARIS_SUNPRO_CXX@
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -47,18 +47,18 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpconnect
 LIBRARY_NAME	= xpconnect
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= xpconect
 IS_COMPONENT	= 1
 MODULE_NAME	= xpconnect
 GRE_MODULE	= 1
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
-LIBRARY_NAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
-SHORT_LIBNAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
+LIBRARY_NAME	= xpc32$(VERSION_NUMBER)
+SHORT_LIBNAME	= xpc32$(VERSION_NUMBER)
 endif
 LIBXUL_LIBRARY = 1
 
 
 # These modules are required because the auto-generated file
 # dom_quickstubs.cpp #includes header files from many places.
 
 
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -43,17 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= pref
 LIBRARY_NAME	= pref
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPrefModule
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
-LIBRARY_NAME	= xppref$(MOZ_BITS)
+LIBRARY_NAME	= xppref32
 endif
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/config.mk
 
 CPPSRCS		= nsPref.cpp \
 			  nsPrefBranch.cpp	\