author | Mike Hommey <mh+mozilla@glandium.org> |
Wed, 28 Dec 2011 08:24:02 +0100 | |
changeset 83433 | 860035a3c04a07e541173b8a9a3eee1ffaaaf8c9 |
parent 83432 | f7279332f966822dd4909b879815b0006118597e |
child 83434 | 8ac6f34b44ff4d3188584450a4215963c809753d |
push id | 21760 |
push user | mbrubeck@mozilla.com |
push date | Wed, 28 Dec 2011 19:04:19 +0000 |
treeherder | mozilla-central@010fe7e7df1a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 701371 |
milestone | 12.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/Makefile.in +++ b/Makefile.in @@ -54,28 +54,37 @@ include $(DEPTH)/config/autoconf.mk default:: TIERS += base # # tier "base" - basic setup # tier_base_dirs = \ - config \ - build \ - probes \ - mfbt \ - $(NULL) + config \ + build \ + probes \ + mfbt \ + $(NULL) ifndef LIBXUL_SDK ifeq (android,$(MOZ_WIDGET_TOOLKIT)) -tier_base_dirs += other-licenses/android other-licenses/skia-npapi +tier_base_dirs += \ + other-licenses/android \ + other-licenses/skia-npapi \ + $(NULL) endif -tier_base_dirs += memory +ifdef MOZ_MEMORY +tier_base_dirs += memory/jemalloc +endif +tier_base_dirs += \ + mozglue \ + memory/mozalloc \ + $(NULL) endif ifdef COMPILE_ENVIRONMENT include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk endif include $(topsrcdir)/config/config.mk
--- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -69,19 +69,19 @@ config/doxygen.cfg config/expandlibs_config.py config/tests/src-simple/Makefile probes/Makefile extensions/Makefile " if [ ! "$LIBXUL_SDK" ]; then add_makefiles " - memory/Makefile memory/mozalloc/Makefile - memory/mozutils/Makefile + mozglue/Makefile + mozglue/build/Makefile " if [ "$MOZ_MEMORY" ]; then add_makefiles " memory/jemalloc/Makefile " fi if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then add_makefiles "
--- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -77,17 +77,17 @@ @BINPATH@/mozcrt19.dll @BINPATH@/mozcpp19.dll #endif #endif #ifdef ANDROID @BINPATH@/AndroidManifest.xml @BINPATH@/resources.arsc @BINPATH@/classes.dex -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ @BINPATH@/res/drawable @BINPATH@/res/drawable-hdpi @BINPATH@/res/layout #endif [browser] ; [Base Browser Files] #ifndef XP_UNIX
--- a/b2g/installer/removed-files.in +++ b/b2g/installer/removed-files.in @@ -1,1 +1,2 @@ README.txt +@DLL_PREFIX@mozutils@DLL_SUFFIX@
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -39,17 +39,17 @@ #ifndef MOZ_STATIC_JS @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ #endif #ifdef XP_MACOSX @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
--- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -5,16 +5,17 @@ # Inspector files are at the very end. .autoreg @DLL_PREFIX@jsj@DLL_SUFFIX@ @DLL_PREFIX@sqlite3@DLL_SUFFIX@ @DLL_PREFIX@xpcom_compat@DLL_SUFFIX@ @DLL_PREFIX@xpistub@DLL_SUFFIX@ @DLL_PREFIX@zlib@DLL_SUFFIX@ @DLL_PREFIX@jemalloc@DLL_SUFFIX@ +@DLL_PREFIX@mozutils@DLL_SUFFIX@ #ifdef MOZ_STATIC_JS @DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif LICENSE update.locale browserconfig.properties chrome/US.jar chrome/app-chrome.manifest
--- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -57,17 +57,17 @@ DIRS += \ $(NULL) PROGRAM = crashinject$(BIN_SUFFIX) USE_STATIC_LIBS = 1 CPPSRCS = crashinject.cpp endif # ENABLE_TESTS -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk ifdef WIN32_REDIST_DIR ifndef MOZ_DEBUG ifeq (1400,$(_MSC_VER)) REDIST_FILES = \
--- a/build/win32/crashinjectdll/Makefile.in +++ b/build/win32/crashinjectdll/Makefile.in @@ -45,11 +45,11 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = crashinjectdll DEFFILE = $(srcdir)/crashinjectdll.def FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 CPPSRCS = crashinjectdll.cpp -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk
--- a/build/win32/vmwarerecordinghelper/Makefile.in +++ b/build/win32/vmwarerecordinghelper/Makefile.in @@ -46,11 +46,11 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = vmwarerecordinghelper DEFFILE = $(srcdir)/$(LIBRARY_NAME).def FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 CPPSRCS = $(LIBRARY_NAME).cpp -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk
--- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -626,18 +626,18 @@ USE_GSSAPI = @USE_GSSAPI@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@ # Win32 options MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ WIN32_REDIST_DIR = @WIN32_REDIST_DIR@ -MOZ_UTILS_LDFLAGS = @MOZ_UTILS_LDFLAGS@ -MOZ_UTILS_PROGRAM_LDFLAGS = @MOZ_UTILS_PROGRAM_LDFLAGS@ +MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@ +MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@ WIN32_CRT_LIBS = @WIN32_CRT_LIBS@ # This is used to pass jemalloc flags to NSS DLLFLAGS = @DLLFLAGS@ # Codesighs tools option, enables win32 mapfiles. MOZ_MAPINFO = @MOZ_MAPINFO@
--- a/config/config.mk +++ b/config/config.mk @@ -238,23 +238,23 @@ endif # NS_TRACE_MALLOC endif # MOZ_DEBUG # We don't build a static CRT when building a custom CRT, # it appears to be broken. So don't link to jemalloc if # the Makefile wants static CRT linking. ifeq ($(MOZ_MEMORY)_$(USE_STATIC_LIBS),1_1) # Disable default CRT libs and add the right lib path for the linker -MOZ_UTILS_LDFLAGS= +MOZ_GLUE_LDFLAGS= endif endif # WINNT && !GNU_CC -ifndef MOZ_UTILS_PROGRAM_LDFLAGS -MOZ_UTILS_PROGRAM_LDFLAGS=$(MOZ_UTILS_LDFLAGS) +ifndef MOZ_GLUE_PROGRAM_LDFLAGS +MOZ_GLUE_PROGRAM_LDFLAGS=$(MOZ_GLUE_LDFLAGS) endif # # Build using PIC by default # _ENABLE_PIC=1 # Determine if module being compiled is destined
--- a/config/rules.mk +++ b/config/rules.mk @@ -787,17 +787,17 @@ endif # EXPORT_LIBRARY endif # LIBRARY_NAME ifneq (,$(filter-out %.$(LIB_SUFFIX),$(SHARED_LIBRARY_LIBS))) $(error SHARED_LIBRARY_LIBS must contain .$(LIB_SUFFIX) files only) endif # Create dependencies on static (and shared EXTRA_DSO_LIBS) libraries DO_EXPAND_LIBS = $(foreach f,$(1),$(if $(filter %.$(LIB_SUFFIX),$(f)),$(if $(wildcard $(f).$(LIBS_DESC_SUFFIX)),$(f).$(LIBS_DESC_SUFFIX),$(if $(wildcard $(f)),$(f))))) -LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_UTILS_PROGRAM_LDFLAGS)))) +LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_GLUE_PROGRAM_LDFLAGS)))) SHARED_LIBRARY_LIBS_DEPS = $(call DO_EXPAND_LIBS,$(SHARED_LIBRARY_LIBS)) HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX),$(HOST_LIBS)) DSO_LDOPTS_DEPS = $(call DO_EXPAND_LIBS,$(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))) # Dependencies which, if modified, should cause everything to rebuild GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk ############################################## @@ -888,17 +888,17 @@ alltags: # # PROGRAM = Foo # creates OBJS, links with LIBS to create Foo # $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) @$(RM) $@.manifest ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f "$(srcdir)/$@.manifest"; then \ echo "Embedding manifest from $(srcdir)/$@.manifest and $@.manifest"; \ mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \ else \ echo "Embedding manifest from $@.manifest"; \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ @@ -910,20 +910,20 @@ ifdef MSMANIFEST_TOOL endif # MSVC with manifest tool ifdef MOZ_PROFILE_GENERATE # touch it a few seconds into the future to work around FAT's # 2-second granularity touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink endif else # !WINNT || GNU_CC ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) @$(call CHECK_STDCXX,$@) else # ! CPP_PROG_LINK - $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC ifdef ENABLE_STRIP $(STRIP) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -959,29 +959,29 @@ endif # in one directory, it assumes everything to compile Foo is in # Foo.o (from either Foo.c or Foo.cpp). # # SIMPLE_PROGRAMS = Foo Bar # creates Foo.o Bar.o, links with LIBS to create Foo, Bar. # $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ rm -f $@.manifest; \ fi endif # MSVC with manifest tool else ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) @$(call CHECK_STDCXX,$@) else - $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC ifdef ENABLE_STRIP $(STRIP) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -1084,20 +1084,20 @@ endif $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) ifndef INCREMENTAL_LINKER $(RM) $@ endif ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) endif # DTRACE_LIB_DEPENDENT @$(call CHECK_STDCXX,$@) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
--- a/configure.in +++ b/configure.in @@ -7139,27 +7139,27 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, if test "$NS_TRACE_MALLOC"; then MOZ_MEMORY= fi if test "$MOZ_DMD"; then MOZ_MEMORY= fi if test "${OS_TARGET}" = "Android"; then - dnl On Android, we use WRAP_LDFLAGS to link everything to mozutils + dnl On Android, we use WRAP_LDFLAGS to link everything to mozglue : elif test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "OS2"; then - dnl On Windows, OSX and OS2, we want to link all our binaries against mozutils - MOZ_UTILS_LDFLAGS='$(call EXPAND_LIBNAME_PATH,mozutils,$(LIBXUL_DIST)/lib)' + dnl On Windows, OSX and OS2, we want to link all our binaries against mozglue + MOZ_GLUE_LDFLAGS='$(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib)' else - dnl On other Unix systems, we only want to link executables against mozutils - MOZ_UTILS_PROGRAM_LDFLAGS='$(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,mozutils,$(LIBXUL_DIST)/lib) $(MKSHLIB_UNFORCE_ALL)' + dnl On other Unix systems, we only want to link executables against mozglue + MOZ_GLUE_PROGRAM_LDFLAGS='$(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib) $(MKSHLIB_UNFORCE_ALL)' if test -n "$GNU_CC"; then - dnl And we need mozutils symbols to be exported. - MOZ_UTILS_PROGRAM_LDFLAGS="$MOZ_UTILS_PROGRAM_LDFLAGS -rdynamic" + dnl And we need mozglue symbols to be exported. + MOZ_GLUE_PROGRAM_LDFLAGS="$MOZ_GLUE_PROGRAM_LDFLAGS -rdynamic" fi fi if test -z "$MOZ_MEMORY"; then case "${target}" in *-mingw*) if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.]) @@ -7202,17 +7202,17 @@ else ;; *-*freebsd*) AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) AC_DEFINE(MOZ_MEMORY_LINUX) AC_DEFINE(MOZ_MEMORY_ANDROID) _WRAP_MALLOC=1 - MOZ_UTILS_LDFLAGS= + MOZ_GLUE_LDFLAGS= ;; *-*linux*) AC_DEFINE(MOZ_MEMORY_LINUX) ;; *-netbsd*) AC_DEFINE(MOZ_MEMORY_BSD) ;; *-solaris*) @@ -7224,21 +7224,21 @@ else WIN32_CRT_LIBS="msvcrt.lib msvcprt.lib" else WIN32_CRT_LIBS="msvcrtd.lib msvcprtd.lib" fi dnl Look for a broken crtdll.obj WIN32_CRTDLL_FULLPATH=`lib -nologo -list $WIN32_CRT_LIBS | grep crtdll\\.obj` lib -NOLOGO -OUT:crtdll.obj $WIN32_CRT_LIBS -EXTRACT:$WIN32_CRTDLL_FULLPATH if grep -q '__imp__\{0,1\}free' crtdll.obj; then - MOZ_UTILS_LDFLAGS='-LIBPATH:$(DIST)/lib -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt' + MOZ_GLUE_LDFLAGS='-LIBPATH:$(DIST)/lib -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt' dnl Also pass this to NSPR/NSS - DLLFLAGS="$DLLFLAGS $MOZ_UTILS_LDFLAGS" + DLLFLAGS="$DLLFLAGS $MOZ_GLUE_LDFLAGS" else - DLLFLAGS="$DLLFLAGS -LIBPATH:\$(DIST)/lib -DEFAULTLIB:mozutils" + DLLFLAGS="$DLLFLAGS -LIBPATH:\$(DIST)/lib -DEFAULTLIB:mozglue" fi rm crtdll.obj export DLLFLAGS ;; *) AC_MSG_ERROR([--enable-jemalloc not supported on ${target}]) ;; @@ -7247,26 +7247,26 @@ else if test "$OS_ARCH" != "WINNT"; then dnl NB: this must be kept in sync with jemalloc.h AC_DEFINE(HAVE_JEMALLOC_VALLOC) fi AC_DEFINE(HAVE_JEMALLOC_POSIX_MEMALIGN) AC_DEFINE(HAVE_JEMALLOC_MEMALIGN) fi # MOZ_MEMORY AC_SUBST(MOZ_MEMORY) -AC_SUBST(MOZ_UTILS_LDFLAGS) -AC_SUBST(MOZ_UTILS_PROGRAM_LDFLAGS) +AC_SUBST(MOZ_GLUE_LDFLAGS) +AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) AC_SUBST(WIN32_CRT_LIBS) dnl Need to set this for make because NSS doesn't have configure AC_SUBST(DLLFLAGS) dnl We need to wrap dlopen and related functions on Android because we use dnl our own linker. if test "$OS_TARGET" = Android; then - WRAP_LDFLAGS="${WRAP_LDFLAGS} -L$_objdir/dist/lib -lmozutils" + WRAP_LDFLAGS="${WRAP_LDFLAGS} -L$_objdir/dist/lib -lmozglue" if test "$MOZ_WIDGET_TOOLKIT" = android; then WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=dlopen,--wrap=dlclose,--wrap=dlerror,--wrap=dlsym,--wrap=dladdr,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror" fi fi dnl ======================================================== dnl = Use malloc wrapper lib dnl ======================================================== @@ -9088,21 +9088,21 @@ if test -z "$MOZ_NATIVE_NSPR"; then ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'" fi ac_configure_args="$ac_configure_args --with-dist-dir=../../dist" ac_configure_args="$ac_configure_args --prefix=$dist" ac_configure_args="$ac_configure_args --with-sync-build-files=$_topsrcdir" if test "$MOZ_MEMORY"; then ac_configure_args="$ac_configure_args --enable-jemalloc" - if test -n "$MOZ_UTILS_LDFLAGS"; then - export MOZ_UTILS_LDFLAGS + if test -n "$MOZ_GLUE_LDFLAGS"; then + export MOZ_GLUE_LDFLAGS fi - if test -n "$MOZ_UTILS_PROGRAM_LDFLAGS"; then - export MOZ_UTILS_PROGRAM_LDFLAGS + if test -n "$MOZ_GLUE_PROGRAM_LDFLAGS"; then + export MOZ_GLUE_PROGRAM_LDFLAGS fi fi export MOZ_APP_NAME AC_OUTPUT_SUBDIRS(js/src) ac_configure_args="$_SUBDIR_CONFIG_ARGS" fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
--- a/db/sqlite3/src/Makefile.in +++ b/db/sqlite3/src/Makefile.in @@ -73,19 +73,19 @@ sqlite-version.h: sqlite-version.py sqli @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \ $(srcdir)/sqlite.def > $(DEFFILE) export:: sqlite-version.h endif endif ifeq (Darwin,$(OS_TARGET)) -# On OSX, with jemalloc enabled, having sqlite linked against mozutils +# On OSX, with jemalloc enabled, having sqlite linked against mozglue # causes crashes in NSS standalone tools. -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = endif # XXX Force -O2 optimisation on Mac because using the default -O3 causes # crashes. See bug 676499. ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) MODULE_OPTIMIZE_FLAGS = -O2 endif
--- a/embedding/android/GeckoAppShell.java +++ b/embedding/android/GeckoAppShell.java @@ -273,17 +273,17 @@ public class GeckoAppShell return retVal; } // java-side stuff public static void loadGeckoLibs(String apkName) { // The package data lib directory isn't placed in ld.so's // search path, so we have to manually load libraries that // libxul will depend on. Not ideal. - System.loadLibrary("mozutils"); + System.loadLibrary("mozglue"); GeckoApp geckoApp = GeckoApp.mAppContext; String homeDir; if (Build.VERSION.SDK_INT < 8 || geckoApp.getApplication().getPackageResourcePath().startsWith("/data") || geckoApp.getApplication().getPackageResourcePath().startsWith("/system")) { File home = geckoApp.getFilesDir(); homeDir = home.getPath(); // handle the application being moved to phone from sdcard
--- a/ipc/app/MozillaRuntimeMainAndroid.cpp +++ b/ipc/app/MozillaRuntimeMainAndroid.cpp @@ -44,17 +44,17 @@ int main(int argc, char* argv[]) { // Check for the absolute minimum number of args we need to move // forward here. We expect the last arg to be the child process type. if (argc < 2) return 1; - void *mozloader_handle = dlopen("libmozutils.so", RTLD_LAZY); + void *mozloader_handle = dlopen("libmozglue.so", RTLD_LAZY); if (!mozloader_handle) { __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad", "Couldn't load mozloader because %s", dlerror()); return 1; } typedef int (*ChildProcessInit_t)(int, char**); ChildProcessInit_t fChildProcessInit =
--- a/js/src/config/autoconf.mk.in +++ b/js/src/config/autoconf.mk.in @@ -308,18 +308,18 @@ MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMO MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@ # Win32 options MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ -MOZ_UTILS_LDFLAGS = @MOZ_UTILS_LDFLAGS@ -MOZ_UTILS_PROGRAM_LDFLAGS = @MOZ_UTILS_PROGRAM_LDFLAGS@ +MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@ +MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@ # Codesighs tools option, enables win32 mapfiles. MOZ_MAPINFO = @MOZ_MAPINFO@ QEMU_CANT_RUN_JS_SHELL = @QEMU_CANT_RUN_JS_SHELL@ MACOS_SDK_DIR = @MACOS_SDK_DIR@ NEXT_ROOT = @NEXT_ROOT@
--- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -238,23 +238,23 @@ endif # NS_TRACE_MALLOC endif # MOZ_DEBUG # We don't build a static CRT when building a custom CRT, # it appears to be broken. So don't link to jemalloc if # the Makefile wants static CRT linking. ifeq ($(MOZ_MEMORY)_$(USE_STATIC_LIBS),1_1) # Disable default CRT libs and add the right lib path for the linker -MOZ_UTILS_LDFLAGS= +MOZ_GLUE_LDFLAGS= endif endif # WINNT && !GNU_CC -ifndef MOZ_UTILS_PROGRAM_LDFLAGS -MOZ_UTILS_PROGRAM_LDFLAGS=$(MOZ_UTILS_LDFLAGS) +ifndef MOZ_GLUE_PROGRAM_LDFLAGS +MOZ_GLUE_PROGRAM_LDFLAGS=$(MOZ_GLUE_LDFLAGS) endif # # Build using PIC by default # _ENABLE_PIC=1 # Determine if module being compiled is destined
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -787,17 +787,17 @@ endif # EXPORT_LIBRARY endif # LIBRARY_NAME ifneq (,$(filter-out %.$(LIB_SUFFIX),$(SHARED_LIBRARY_LIBS))) $(error SHARED_LIBRARY_LIBS must contain .$(LIB_SUFFIX) files only) endif # Create dependencies on static (and shared EXTRA_DSO_LIBS) libraries DO_EXPAND_LIBS = $(foreach f,$(1),$(if $(filter %.$(LIB_SUFFIX),$(f)),$(if $(wildcard $(f).$(LIBS_DESC_SUFFIX)),$(f).$(LIBS_DESC_SUFFIX),$(if $(wildcard $(f)),$(f))))) -LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_UTILS_PROGRAM_LDFLAGS)))) +LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_GLUE_PROGRAM_LDFLAGS)))) SHARED_LIBRARY_LIBS_DEPS = $(call DO_EXPAND_LIBS,$(SHARED_LIBRARY_LIBS)) HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX),$(HOST_LIBS)) DSO_LDOPTS_DEPS = $(call DO_EXPAND_LIBS,$(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))) # Dependencies which, if modified, should cause everything to rebuild GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk ############################################## @@ -888,17 +888,17 @@ alltags: # # PROGRAM = Foo # creates OBJS, links with LIBS to create Foo # $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) @$(RM) $@.manifest ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f "$(srcdir)/$@.manifest"; then \ echo "Embedding manifest from $(srcdir)/$@.manifest and $@.manifest"; \ mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \ else \ echo "Embedding manifest from $@.manifest"; \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ @@ -910,20 +910,20 @@ ifdef MSMANIFEST_TOOL endif # MSVC with manifest tool ifdef MOZ_PROFILE_GENERATE # touch it a few seconds into the future to work around FAT's # 2-second granularity touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink endif else # !WINNT || GNU_CC ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) @$(call CHECK_STDCXX,$@) else # ! CPP_PROG_LINK - $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC ifdef ENABLE_STRIP $(STRIP) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -959,29 +959,29 @@ endif # in one directory, it assumes everything to compile Foo is in # Foo.o (from either Foo.c or Foo.cpp). # # SIMPLE_PROGRAMS = Foo Bar # creates Foo.o Bar.o, links with LIBS to create Foo, Bar. # $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ rm -f $@.manifest; \ fi endif # MSVC with manifest tool else ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) @$(call CHECK_STDCXX,$@) else - $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC ifdef ENABLE_STRIP $(STRIP) $@ endif ifdef MOZ_POST_PROGRAM_COMMAND $(MOZ_POST_PROGRAM_COMMAND) $@ @@ -1084,20 +1084,20 @@ endif $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) ifndef INCREMENTAL_LINKER $(RM) $@ endif ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) endif # DTRACE_LIB_DEPENDENT @$(call CHECK_STDCXX,$@) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
--- a/js/src/configure.in +++ b/js/src/configure.in @@ -4288,33 +4288,33 @@ if test "$MOZ_MEMORY"; then *-netbsd*) AC_DEFINE(MOZ_MEMORY_BSD) ;; *-solaris*) AC_DEFINE(MOZ_MEMORY_SOLARIS) ;; *-mingw*) AC_DEFINE(MOZ_MEMORY_WINDOWS) - # the interesting bits will get passed down in MOZ_UTILS_LDFLAGS + # the interesting bits will get passed down in MOZ_GLUE_LDFLAGS ;; *) AC_MSG_ERROR([--enable-jemalloc not supported on ${target}]) ;; esac if test "$OS_ARCH" != "Darwin"; then dnl NB: this must be kept in sync with jemalloc.h AC_DEFINE(HAVE_JEMALLOC_VALLOC) AC_DEFINE(HAVE_JEMALLOC_POSIX_MEMALIGN) AC_DEFINE(HAVE_JEMALLOC_MEMALIGN) fi fi AC_SUBST(MOZ_MEMORY) -AC_SUBST(MOZ_UTILS_LDFLAGS) -AC_SUBST(MOZ_UTILS_PROGRAM_LDFLAGS) +AC_SUBST(MOZ_GLUE_LDFLAGS) +AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) dnl ======================================================== dnl = Use malloc wrapper lib dnl ======================================================== MOZ_ARG_ENABLE_BOOL(wrap-malloc, [ --enable-wrap-malloc Wrap malloc calls (gnu linker only)], _WRAP_MALLOC=1, _WRAP_MALLOC= )
deleted file mode 100644 --- a/memory/Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Mozilla platform. -# -# The Initial Developer of the Original Code is -# the Mozilla Foundation <http://www.mozilla.org/>. -# Portions created by the Initial Developer are Copyright (C) 2009 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = .. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -DIRS = - -ifdef MOZ_MEMORY -DIRS += jemalloc -endif - -DIRS += mozutils -DIRS += mozalloc - -include $(topsrcdir)/config/rules.mk
--- a/mobile/android/base/GeckoApp.java +++ b/mobile/android/base/GeckoApp.java @@ -1407,17 +1407,17 @@ abstract public class GeckoApp @Override public void onCreate(Bundle savedInstanceState) { // StrictMode is set by defaults resource flag |enableStrictMode|. if (getResources().getBoolean(R.bool.enableStrictMode)) { enableStrictMode(); } - System.loadLibrary("mozutils"); + System.loadLibrary("mozglue"); mMainHandler = new Handler(); Log.w(LOGTAG, "zerdatime " + new Date().getTime() + " - onCreate"); if (savedInstanceState != null) { mLastUri = savedInstanceState.getString(SAVED_STATE_URI); mLastTitle = savedInstanceState.getString(SAVED_STATE_TITLE); mLastViewport = savedInstanceState.getString(SAVED_STATE_VIEWPORT); mLastScreen = savedInstanceState.getByteArray(SAVED_STATE_SCREEN); }
--- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -42,17 +42,17 @@ #ifndef MOZ_STATIC_JS @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ #endif #ifdef XP_MACOSX @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ #else @@ -79,17 +79,16 @@ #endif #ifdef ANDROID @BINPATH@/AndroidManifest.xml @BINPATH@/resources.arsc @BINPATH@/package-name.txt @BINPATH@/classes.dex -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ @BINPATH@/res/drawable @BINPATH@/res/drawable-hdpi @BINPATH@/res/layout @BINPATH@/recommended-addons.json #endif #ifdef MOZ_PLATFORM_MAEMO @BINPATH@/res/drawable
--- a/mobile/android/installer/removed-files.in +++ b/mobile/android/installer/removed-files.in @@ -1,30 +1,31 @@ update.locale README.txt components/nsTryToClose.js #if MOZ_UPDATE_CHANNEL != beta extensions/feedback@mobile.mozilla.org.xpi #endif #ifdef XP_WIN #if _MSC_VER != 1400 - @BINPATH@/Microsoft.VC80.CRT.manifest - @BINPATH@/msvcm80.dll - @BINPATH@/msvcp80.dll - @BINPATH@/msvcr80.dll + Microsoft.VC80.CRT.manifest + msvcm80.dll + msvcp80.dll + msvcr80.dll #endif #if _MSC_VER != 1500 - @BINPATH@/Microsoft.VC90.CRT.manifest - @BINPATH@/msvcm90.dll - @BINPATH@/msvcp90.dll - @BINPATH@/msvcr90.dll + Microsoft.VC90.CRT.manifest + msvcm90.dll + msvcp90.dll + msvcr90.dll #endif #if _MSC_VER != 1600 - @BINPATH@/msvcp100.dll - @BINPATH@/msvcr100.dll + msvcp100.dll + msvcr100.dll #endif #if _MSC_VER != 1700 - @BINPATH@/msvcp110.dll - @BINPATH@/msvcr110.dll + msvcp110.dll + msvcr110.dll #endif mozcrt19.dll mozcpp19.dll #endif +@DLL_PREFIX@mozutils@DLL_SUFFIX@
--- a/mobile/xul/installer/package-manifest.in +++ b/mobile/xul/installer/package-manifest.in @@ -42,17 +42,17 @@ #ifndef MOZ_STATIC_JS @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ #endif #ifdef XP_MACOSX @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ #else @@ -80,17 +80,16 @@ #endif #ifdef ANDROID @BINPATH@/AndroidManifest.xml @BINPATH@/resources.arsc @BINPATH@/package-name.txt @BINPATH@/classes.dex -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ @BINPATH@/res/drawable @BINPATH@/res/drawable-hdpi @BINPATH@/res/layout #endif #ifdef MOZ_PLATFORM_MAEMO @BINPATH@/res/drawable #endif
--- a/mobile/xul/installer/removed-files.in +++ b/mobile/xul/installer/removed-files.in @@ -1,30 +1,31 @@ update.locale README.txt components/nsTryToClose.js #if MOZ_UPDATE_CHANNEL != beta extensions/feedback@mobile.mozilla.org.xpi #endif #ifdef XP_WIN #if _MSC_VER != 1400 - @BINPATH@/Microsoft.VC80.CRT.manifest - @BINPATH@/msvcm80.dll - @BINPATH@/msvcp80.dll - @BINPATH@/msvcr80.dll + Microsoft.VC80.CRT.manifest + msvcm80.dll + msvcp80.dll + msvcr80.dll #endif #if _MSC_VER != 1500 - @BINPATH@/Microsoft.VC90.CRT.manifest - @BINPATH@/msvcm90.dll - @BINPATH@/msvcp90.dll - @BINPATH@/msvcr90.dll + Microsoft.VC90.CRT.manifest + msvcm90.dll + msvcp90.dll + msvcr90.dll #endif #if _MSC_VER != 1600 - @BINPATH@/msvcp100.dll - @BINPATH@/msvcr100.dll + msvcp100.dll + msvcr100.dll #endif #if _MSC_VER != 1700 - @BINPATH@/msvcp110.dll - @BINPATH@/msvcr110.dll + msvcp110.dll + msvcr110.dll #endif mozcrt19.dll mozcpp19.dll #endif +@DLL_PREFIX@mozutils@DLL_SUFFIX@
rename from memory/mozutils/Makefile.in rename to mozglue/Makefile.in --- a/memory/mozutils/Makefile.in +++ b/mozglue/Makefile.in @@ -1,178 +1,47 @@ -# # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # The Original Code is mozilla.org code. # # The Initial Developer of the Original Code is -# Mozilla Foundation -# Portions created by the Initial Developer are Copyright (C) 2008 +# Mozilla Foundation. +# Portions created by the Initial Developer are Copyright (C) 2011 # the Initial Developer. All Rights Reserved. # # Contributor(s): -# Ted Mielczarek <ted.mielczarek@gmail.com> +# Mike Hommey <mh@glandium.org> # # Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), # in which case the provisions of the GPL or the LGPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of either the GPL or the LGPL, and not to allow others to # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = mozutils -LIBRARY_NAME = mozutils -DIST_INSTALL = 1 - -ifdef MOZ_MEMORY -SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) -else -# Temporary, until bug 662814 lands -VISIBILITY_FLAGS = -CPPSRCS = dummy.cpp -endif - -# Build mozutils as a shared lib on Windows, OSX and Android. -ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) -FORCE_SHARED_LIB = 1 -else -FORCE_STATIC_LIB = 1 -endif - -MOZ_UTILS_LDFLAGS = # Don't link against ourselves - -ifeq (WINNT,$(OS_TARGET)) -DEFFILE = mozutils.def - -mozutils.def: mozutils.def.in - $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(ACDEFINES) $< > $@ - -GARBAGE += mozutils.def - -LDFLAGS += -ENTRY:DllMain - -ifneq (,$(filter -DEFAULTLIB:mozcrt,$(MOZ_UTILS_LDFLAGS))) -# Don't install the import library if we use mozcrt -NO_INSTALL_IMPORT_LIBRARY = 1 -endif -endif - -ifeq (android, $(MOZ_WIDGET_TOOLKIT)) -# Add Android linker -EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android) -endif - -ifeq (Android, $(OS_TARGET)) -WRAP_LDFLAGS = -endif +DIRS = build include $(topsrcdir)/config/rules.mk - -ifdef MOZ_MEMORY -ifeq (Darwin,$(OS_TARGET)) -LDFLAGS += -init _jemalloc_darwin_init -endif - -ifeq (WINNT,$(OS_TARGET)) -# Roll our own custom logic here for the import library - -############################################################################### -# -# Linking Mozilla itself to jemalloc is not particularly difficult. To do this -# we avoid linking directly to the Microsoft-provided CRT import libraries. -# Instead, we link to our own import library which we generate here. To -# replace the CRT's malloc/free/other memory management symbols we export -# our own versions out of jemalloc.dll. We then take the import library that -# the compiler generates for jemalloc.dll and combine it with the MS CRT import -# libraries. We put our library on the command line first, and the CRT symbols -# are discarded in favor of our versions! -# -# Unfortunately that was too easy. The CRT import library is not a standard -# import library that contains a list of symbols and whatnot. It also includes -# object files that are linked into generated programs. One of these, -# crtdll.obj is (as one might expect) linked into all DLLs that link against -# the CRT. This file does things like run static C++ constructors when the -# DLL is attached, call DllMain, etc. -# -# In the CRT source all malloc/free calls are made to malloc_crt and free_crt. -# In debug builds these are both defined to malloc_dbg and free_dbg. In opt -# builds malloc_crt is an actual function, implemented and exposed from the -# CRT. free_crt is, however, defined to be just plain old free. This works -# fine inside the CRT where malloc_crt and free operate on the same heap. -# Outside the CRT malloc_crt is in the CRT's heap, but free is in jemalloc's -# heap. This causes much pain at shutdown :-( -# -# The obvious solution here is to override malloc_crt too. Unfortunately, -# that doesn't work because the CRT expects to be able to call msize on this -# piece of memory deep inside the CRT, which will fail because it'll call the -# CRT's msize on a pointer in jemalloc's heap. -# -# Our solution to this is quite devious. We take apart the CRT's import lib -# and remove the problematic object file. We then poke at the object file's -# symbol table and replace '__imp__free' (which means grab free from some -# other DLL) with '__imp__frex'. Then we define our own dummy no-op function -# in jemalloc.dll and export it as frex. Then we put the CRT import lib -# back together with the patched crtdll.obj, glue it to the end of jemalloc's -# import library and link the rest of Mozilla to that. -# -# The result? A binary that uses jemalloc, doesn't crash, and leaks a tiny -# amount of memory (32 words per DLL in the 2010 CRT) at shutdown. -# -############################################################################### - -libs:: mozcrt.lib - $(INSTALL) $(IFLAGS2) mozcrt.lib $(DIST)/lib - -# And finally combine that with the jemalloc import library to get an import -# library that has our malloc/free/etc and the CRT's everything else -mozcrt.lib: $(IMPORT_LIBRARY) msvc_modified.lib - lib -OUT:$@ $^ - -# Put the fixed object file back in -msvc_modified.lib: msvc_removed.lib crtdll_fixed.obj - lib -OUT:$@ $^ - -# Fix the object file -crtdll_fixed.obj: crtdll.obj - $(PYTHON) $(srcdir)/fixcrt.py - -# Find the path of crtdll.obj -CRTDLL_FULLPATH=$(subst \,\\,$(shell lib -list msvc_combined.lib | grep crtdll\\.obj)) - -# Remove the broken object file, only after we have extracted it -msvc_removed.lib: msvc_combined.lib crtdll.obj - lib -OUT:$@ msvc_combined.lib -REMOVE:$(CRTDLL_FULLPATH) - -# Extract the broken object file out of the combined library -crtdll.obj: msvc_combined.lib - lib -OUT:$@ $^ -EXTRACT:$(CRTDLL_FULLPATH) - -# Grab both CRT libraries and combine them into one library to simplify things -msvc_combined.lib: - lib -OUT:$@ $(WIN32_CRT_LIBS) -endif -endif # MOZ_MEMORY
copy from memory/mozutils/Makefile.in copy to mozglue/build/Makefile.in --- a/memory/mozutils/Makefile.in +++ b/mozglue/build/Makefile.in @@ -38,48 +38,48 @@ DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = mozutils -LIBRARY_NAME = mozutils +MODULE = mozglue +LIBRARY_NAME = mozglue DIST_INSTALL = 1 ifdef MOZ_MEMORY -SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) +SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) else # Temporary, until bug 662814 lands VISIBILITY_FLAGS = CPPSRCS = dummy.cpp endif -# Build mozutils as a shared lib on Windows, OSX and Android. +# Build mozglue as a shared lib on Windows, OSX and Android. ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) FORCE_SHARED_LIB = 1 else FORCE_STATIC_LIB = 1 endif -MOZ_UTILS_LDFLAGS = # Don't link against ourselves +MOZ_GLUE_LDFLAGS = # Don't link against ourselves ifeq (WINNT,$(OS_TARGET)) -DEFFILE = mozutils.def +DEFFILE = mozglue.def -mozutils.def: mozutils.def.in +mozglue.def: mozglue.def.in $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(ACDEFINES) $< > $@ -GARBAGE += mozutils.def +GARBAGE += mozglue.def LDFLAGS += -ENTRY:DllMain -ifneq (,$(filter -DEFAULTLIB:mozcrt,$(MOZ_UTILS_LDFLAGS))) +ifneq (,$(filter -DEFAULTLIB:mozcrt,$(MOZ_GLUE_LDFLAGS))) # Don't install the import library if we use mozcrt NO_INSTALL_IMPORT_LIBRARY = 1 endif endif ifeq (android, $(MOZ_WIDGET_TOOLKIT)) # Add Android linker EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
rename from memory/mozutils/mozutils.def.in rename to mozglue/build/mozutils.def.in --- a/memory/mozutils/mozutils.def.in +++ b/mozglue/build/mozutils.def.in @@ -28,17 +28,17 @@ ; use your version of this file under the terms of the MPL, indicate your ; decision by deleting the provisions above and replace them with the notice ; and other provisions required by the GPL or the LGPL. If you do not delete ; the provisions above, a recipient may use your version of this file under ; the terms of any one of the MPL, the GPL or the LGPL. ; ; ***** END LICENSE BLOCK ***** -LIBRARY mozutils.dll +LIBRARY mozglue.dll EXPORTS #ifdef MOZ_MEMORY ; symbols that are actually useful malloc=je_malloc valloc=je_valloc calloc=je_calloc realloc=je_realloc
--- a/other-licenses/android/linker.c +++ b/other-licenses/android/linker.c @@ -186,17 +186,17 @@ static void insert_soinfo_into_debug_map /* Copy the necessary fields into the debug structure. */ map = &(info->linkmap); map->l_addr = info->base; map->l_name = (char*) info->name; map->l_ld = (uintptr_t)info->dynamic; - /* Stick the new library before libmozutils.so + /* Stick the new library before libmozglue.so */ if (!_r_debug) return; map->l_next = r_debug_insert; map->l_prev = r_debug_insert->l_prev; r_debug_insert->l_prev->l_next = map; r_debug_insert->l_prev = map; } @@ -2444,17 +2444,17 @@ void simple_linker_init(void) DEBUG("Failed to find DT_DEBUG info in program\n"); return; } /* Find link_map info for ourselves, we will be inserting libraries we * load before that */ struct link_map *map = debug->r_map; while (map) { - if (strcmp(map->l_name, "libmozutils.so")) + if (strcmp(map->l_name, "libmozglue.so")) r_debug_insert = map; map = map->l_next; } if (r_debug_insert) _r_debug = debug; } #else
--- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -50,19 +50,19 @@ MODULE = crashreporter # Don't use the STL wrappers in the crashreporter clients; they don't # link with -lmozalloc, and it really doesn't matter here anyway. STL_FLAGS = ifneq ($(OS_TARGET),Android) PROGRAM = crashreporter$(BIN_SUFFIX) DIST_PROGRAM = crashreporter$(BIN_SUFFIX) -# Don't link the updater against libmozutils. -MOZ_UTILS_LDFLAGS = -MOZ_UTILS_PROGRAM_LDFLAGS = +# Don't link the updater against libmozglue. +MOZ_GLUE_LDFLAGS = +MOZ_GLUE_PROGRAM_LDFLAGS = endif LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src VPATH += $(topsrcdir)/build/ CPPSRCS = \ crashreporter.cpp \
--- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -81,17 +81,17 @@ SDK_PATH = sdk/ endif SDK_SUFFIX = $(PKG_SUFFIX) SDK = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX) # JavaScript Shell packaging ifndef LIBXUL_SDK JSSHELL_BINS = \ $(DIST)/bin/js$(BIN_SUFFIX) \ - $(DIST)/bin/mozutils$(DLL_SUFFIX) \ + $(DIST)/bin/mozglue$(DLL_SUFFIX) \ $(NULL) ifndef MOZ_NATIVE_NSPR JSSHELL_BINS += $(DIST)/bin/$(LIB_PREFIX)nspr4$(DLL_SUFFIX) ifeq ($(OS_ARCH),WINNT) ifdef MOZ_MEMORY JSSHELL_BINS += $(DIST)/bin/jemalloc$(DLL_SUFFIX) endif ifeq ($(_MSC_VER),1400) @@ -330,17 +330,17 @@ GECKO_APP_AP_PATH = $(call core_abspath, endif PKG_SUFFIX = .apk INNER_MAKE_PACKAGE = \ make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \ cp $(GECKO_APP_AP_PATH)/gecko.ap_ $(_ABS_DIST) && \ ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \ mkdir -p lib/$(ABI_DIR) && \ - mv libmozutils.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \ + mv libmozglue.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \ rm -f lib.id && \ for SOMELIB in *.so ; \ do \ printf "`basename $$SOMELIB`:`$(_ABS_DIST)/host/bin/file_id $$SOMELIB`\n" >> lib.id ; \ done && \ unzip -o $(_ABS_DIST)/gecko.ap_ && \ rm $(_ABS_DIST)/gecko.ap_ && \ $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) && \ @@ -349,17 +349,17 @@ INNER_MAKE_PACKAGE = \ $(APKBUILDER) $(_ABS_DIST)/gecko.apk -v $(APKBUILDER_FLAGS) -z $(_ABS_DIST)/gecko.ap_ -f $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \ cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \ $(JARSIGNER) $(_ABS_DIST)/gecko.apk && \ $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) INNER_UNMAKE_PACKAGE = \ mkdir $(MOZ_PKG_DIR) && \ cd $(MOZ_PKG_DIR) && \ $(UNZIP) $(UNPACKAGE) && \ - mv lib/$(ABI_DIR)/libmozutils.so . && \ + mv lib/$(ABI_DIR)/libmozglue.so . && \ mv lib/$(ABI_DIR)/*plugin-container* $(MOZ_CHILD_PROCESS_NAME) && \ rm -rf lib/$(ABI_DIR) endif ifeq ($(MOZ_PKG_FORMAT),DMG) ifndef _APPNAME _APPNAME = $(MOZ_MACBUNDLE_NAME) endif ifndef _BINPATH
--- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -46,19 +46,19 @@ include $(DEPTH)/config/autoconf.mk CPPSRCS = \ updater.cpp \ bspatch.cpp \ archivereader.cpp \ $(NULL) PROGRAM = updater$(BIN_SUFFIX) -# Don't link the updater against libmozutils. See bug 687139 -MOZ_UTILS_LDFLAGS = -MOZ_UTILS_PROGRAM_LDFLAGS = +# Don't link the updater against libmozglue. See bug 687139 +MOZ_GLUE_LDFLAGS = +MOZ_GLUE_PROGRAM_LDFLAGS = LOCAL_INCLUDES += -I$(srcdir)/../../readstrings LIBS += \ $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ ../../readstrings/$(LIB_PREFIX)readstrings.$(LIB_SUFFIX) \ $(BZ2_LIBS) \ $(NULL)