Skip to content

Commit 8cf8cff

Browse files
glandiumglandium
committed
Backout changeset f12e5c87adf6 (bug 852950) because it breaks running from dist/bin
1 parent 202e198 commit 8cf8cff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+831
-306
lines changed

‎b2g/installer/package-manifest.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
5555
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
5656
#endif
57+
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
5758
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
5859
#ifdef MOZ_DMD
5960
@BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@

‎b2g/installer/removed-files.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ components/dom_sms.xpt
2020
@DLL_PREFIX@nssutil3@DLL_SUFFIX@
2121
@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
2222
#endif
23-
@DLL_PREFIX@xpcom@DLL_SUFFIX@

‎browser/installer/package-manifest.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
7070
#endif
7171
#endif
72+
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
7273
#ifdef XP_MACOSX
7374
@BINPATH@/XUL
7475
#else

‎browser/installer/removed-files.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
@DLL_PREFIX@nssutil3@DLL_SUFFIX@
2727
@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
2828
#endif
29-
@DLL_PREFIX@xpcom@DLL_SUFFIX@
3029
LICENSE
3130
browserconfig.properties
3231
chrome/US.jar

‎configure.in

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,10 +1019,10 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
10191019

10201020
MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
10211021
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
1022-
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxul -lxpcom_core -lmozalloc'
1022+
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
10231023
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
1024-
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxul -lmozalloc'
1025-
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)'
1024+
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
1025+
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
10261026
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
10271027
XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
10281028

@@ -2116,8 +2116,8 @@ ia64*-hpux*)
21162116
# mingw doesn't require kernel32, user32, and advapi32 explicitly
21172117
LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32 -lnetapi32"
21182118
MOZ_FIX_LINK_PATHS=
2119-
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxul -lxpcom_core -lmozalloc'
2120-
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxul -lmozalloc'
2119+
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
2120+
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc'
21212121
DLL_PREFIX=
21222122
IMPORT_LIB_SUFFIX=dll.a
21232123

@@ -2182,9 +2182,9 @@ ia64*-hpux*)
21822182
WARNINGS_AS_ERRORS='-WX'
21832183
MOZ_OPTIMIZE_FLAGS='-O1'
21842184
MOZ_FIX_LINK_PATHS=
2185-
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2186-
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2187-
LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2185+
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2186+
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2187+
LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
21882188
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
21892189
LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT"
21902190
dnl For profile-guided optimization
@@ -2358,8 +2358,8 @@ ia64*-hpux*)
23582358
MOZ_DEBUG_FLAGS="-g -fno-inline"
23592359
MOZ_OPTIMIZE_FLAGS="-O2"
23602360
MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
2361-
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2362-
LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2361+
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
2362+
LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
23632363
TARGET_MD_ARCH=os2
23642364
_PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
23652365
RC=rc.exe
@@ -4582,8 +4582,7 @@ cairo-cocoa)
45824582
TK_CFLAGS="-DNO_X11"
45834583
CFLAGS="$CFLAGS $TK_CFLAGS"
45844584
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
4585-
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/bin/XUL -lxpcom_core -lmozalloc'
4586-
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/bin/XUL -lmozalloc'
4585+
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
45874586
MOZ_USER_DIR="Mozilla"
45884587
MOZ_FS_LAYOUT=bundle
45894588
MOZ_WEBGL=1
@@ -4598,8 +4597,7 @@ cairo-uikit)
45984597
TK_LIBS='-framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreText'
45994598
CFLAGS="$CFLAGS $TK_CFLAGS"
46004599
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
4601-
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/bin/XUL -lxpcom_core -lmozalloc'
4602-
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/bin/XUL -lmozalloc'
4600+
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
46034601
MOZ_USER_DIR="Mozilla"
46044602
MOZ_FS_LAYOUT=bundle
46054603
;;

‎mobile/android/installer/package-manifest.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
4141
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
4242
#endif
43+
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
4344
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
4445
@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
4546
@BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@

‎mozglue/android/APKOpen.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,11 @@ loadGeckoLibs(const char *apkName)
224224
file_ids = (char *)extractBuf("lib.id", zip);
225225
#endif
226226

227-
char *file = new char[strlen(apkName) + sizeof("!/libxul.so")];
228-
sprintf(file, "%s!/libxul.so", apkName);
229-
xul_handle = __wrap_dlopen(file, RTLD_GLOBAL | RTLD_LAZY);
227+
char *file = new char[strlen(apkName) + sizeof("!/libxpcom.so")];
228+
sprintf(file, "%s!/libxpcom.so", apkName);
229+
__wrap_dlopen(file, RTLD_GLOBAL | RTLD_LAZY);
230+
// libxul.so is pulled from libxpcom.so, so we don't need to give the full path
231+
xul_handle = __wrap_dlopen("libxul.so", RTLD_GLOBAL | RTLD_LAZY);
230232
delete[] file;
231233

232234
#ifdef MOZ_CRASHREPORTER

‎toolkit/library/Makefile.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,3 @@ ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
686686
# Wrap linker to measure peak virtual memory usage.
687687
LD := $(PYTHON) $(topsrcdir)/build/link.py $(CURDIR)/linker-vsize $(LD)
688688
endif
689-
690-
libs:: $(FINAL_TARGET)/dependentlibs.list
691-
692-
$(FINAL_TARGET)/dependentlibs.list: dependentlibs.py $(SHARED_LIBRARY) $(wildcard $(if $(wildcard $(FINAL_TARGET)/dependentlibs.list),$(addprefix $(FINAL_TARGET)/,$(shell cat $(FINAL_TARGET)/dependentlibs.list))))
693-
$(PYTHON) $< $(SHARED_LIBRARY) -L $(FINAL_TARGET) $(if $(TOOLCHAIN_PREFIX),$(addprefix -p ,$(TOOLCHAIN_PREFIX))) > $@

‎toolkit/toolkit.mozbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ add_tier_dir('platform', app_libxul_dirs)
206206
add_tier_dir('platform', app_libxul_static_dirs, static=True)
207207

208208
add_tier_dir('platform', 'toolkit/library')
209+
add_tier_dir('platform', 'xpcom/stub')
209210

210211
if CONFIG['MOZ_REPLACE_MALLOC']:
211212
add_tier_dir('platform', 'memory/replace')

‎xpcom/build/FrozenFunctions.cpp

Lines changed: 0 additions & 131 deletions
This file was deleted.

‎xpcom/build/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CPPSRCS = \
3838
Services.cpp \
3939
Omnijar.cpp \
4040
FileLocation.cpp \
41-
FrozenFunctions.cpp \
4241
$(NULL)
4342

4443
ifeq (Darwin, $(OS_ARCH))

‎xpcom/build/nsXPCOM.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,34 @@
66
#ifndef nsXPCOM_h__
77
#define nsXPCOM_h__
88

9+
/* Map frozen functions to private symbol names if not using strict API. */
10+
#ifdef MOZILLA_INTERNAL_API
11+
# define NS_InitXPCOM2 NS_InitXPCOM2_P
12+
# define NS_ShutdownXPCOM NS_ShutdownXPCOM_P
13+
# define NS_GetServiceManager NS_GetServiceManager_P
14+
# define NS_GetComponentManager NS_GetComponentManager_P
15+
# define NS_GetComponentRegistrar NS_GetComponentRegistrar_P
16+
# define NS_GetMemoryManager NS_GetMemoryManager_P
17+
# define NS_NewLocalFile NS_NewLocalFile_P
18+
# define NS_NewNativeLocalFile NS_NewNativeLocalFile_P
19+
# define NS_GetDebug NS_GetDebug_P
20+
# define NS_GetTraceRefcnt NS_GetTraceRefcnt_P
21+
# define NS_Alloc NS_Alloc_P
22+
# define NS_Realloc NS_Realloc_P
23+
# define NS_Free NS_Free_P
24+
# define NS_DebugBreak NS_DebugBreak_P
25+
# define NS_LogInit NS_LogInit_P
26+
# define NS_LogTerm NS_LogTerm_P
27+
# define NS_LogAddRef NS_LogAddRef_P
28+
# define NS_LogRelease NS_LogRelease_P
29+
# define NS_LogCtor NS_LogCtor_P
30+
# define NS_LogDtor NS_LogDtor_P
31+
# define NS_LogCOMPtrAddRef NS_LogCOMPtrAddRef_P
32+
# define NS_LogCOMPtrRelease NS_LogCOMPtrRelease_P
33+
# define NS_CycleCollectorSuspect2 NS_CycleCollectorSuspect2_P
34+
# define NS_CycleCollectorForget2 NS_CycleCollectorForget2_P
35+
#endif
36+
937
#include "nscore.h"
1038
#include "nsXPCOMCID.h"
1139

‎xpcom/build/nsXPCOMPrivate.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ void LogTerm();
217217
#define XPCOM_SEARCH_KEY "PATH"
218218
#define GRE_CONF_NAME "gre.config"
219219
#define GRE_WIN_REG_LOC L"Software\\mozilla.org\\GRE"
220-
#define XPCOM_DLL XUL_DLL
221-
#define LXPCOM_DLL LXUL_DLL
220+
#define XPCOM_DLL "xpcom.dll"
221+
#define LXPCOM_DLL L"xpcom.dll"
222222
#define XUL_DLL "xul.dll"
223223
#define LXUL_DLL L"xul.dll"
224224

225225
#else // Unix
226226
#include <limits.h> // for PATH_MAX
227227

228-
#define XPCOM_DLL XUL_DLL
228+
#define XPCOM_DLL "libxpcom" MOZ_DLL_SUFFIX
229229

230230
// you have to love apple..
231231
#ifdef XP_MACOSX

‎xpcom/glue/nsCycleCollectorUtils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "mozilla/threads/nsThreadIDs.h"
1010

1111
#if defined(MOZILLA_INTERNAL_API)
12+
#define NS_IsCycleCollectorThread NS_IsCycleCollectorThread_P
1213
#if defined(XP_WIN)
1314
bool NS_IsCycleCollectorThread();
1415
#elif defined(NS_TLS)

‎xpcom/glue/nsThreadUtils.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@
1919
#include "mozilla/threads/nsThreadIDs.h"
2020
#include "mozilla/Likely.h"
2121

22+
// This is needed on some systems to prevent collisions between the symbols
23+
// appearing in xpcom_core and xpcomglue. It may be unnecessary in the future
24+
// with better toolchain support.
25+
#ifdef MOZILLA_INTERNAL_API
26+
# define NS_SetThreadName NS_SetThreadName_P
27+
# define NS_NewThread NS_NewThread_P
28+
# define NS_NewNamedThread NS_NewNamedThread_P
29+
# define NS_GetCurrentThread NS_GetCurrentThread_P
30+
# define NS_GetMainThread NS_GetMainThread_P
31+
# define NS_IsMainThread NS_IsMainThread_P
32+
# define NS_DispatchToCurrentThread NS_DispatchToCurrentThread_P
33+
# define NS_DispatchToMainThread NS_DispatchToMainThread_P
34+
# define NS_ProcessPendingEvents NS_ProcessPendingEvents_P
35+
# define NS_HasPendingEvents NS_HasPendingEvents_P
36+
# define NS_ProcessNextEvent NS_ProcessNextEvent_P
37+
#endif
38+
2239
//-----------------------------------------------------------------------------
2340
// These methods are alternatives to the methods on nsIThreadManager, provided
2441
// for convenience.

‎xpcom/reflect/xptcall/public/xptcall.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
#ifndef xptcall_h___
99
#define xptcall_h___
1010

11+
#ifdef MOZILLA_INTERNAL_API
12+
# define NS_GetXPTCallStub NS_GetXPTCallStub_P
13+
# define NS_DestroyXPTCallStub NS_DestroyXPTCallStub_P
14+
# define NS_InvokeByIndex NS_InvokeByIndex_P
15+
#endif
16+
1117
#include "nscore.h"
1218
#include "nsISupports.h"
1319
#include "xpt_struct.h"

0 commit comments

Comments
 (0)