--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -39,17 +39,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = browserabout
LIBRARY_NAME = browserabout_s
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
EXPORTS_NAMESPACES = mozilla/browser
EXPORTS_mozilla/browser = AboutRedirector.h
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -43,17 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = browserdir
LIBRARY_NAME = browserdir_s
DIRS = tests
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
# Because we are an application component, link against the CRT statically
# (on Windows, but only if we're not building our own CRT for jemalloc)
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
EXPORTS_NAMESPACES = mozilla/browser
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -39,17 +39,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = browser_feeds
LIBRARY_NAME = browser_feeds_s
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
DEFINES += \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
$(NULL)
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -39,17 +39,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = migration
LIBRARY_NAME = migration_s
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
CPPSRCS = nsProfileMigrator.cpp \
nsBrowserProfileMigratorUtils.cpp \
$(NULL)
--- a/browser/components/privatebrowsing/src/Makefile.in
+++ b/browser/components/privatebrowsing/src/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = privatebrowsing
LIBRARY_NAME = privatebrowsing_s
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
CPPSRCS = \
nsPrivateBrowsingServiceWrapper.cpp \
$(NULL)
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = shellservice
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
ifeq ($(OS_ARCH),WINNT)
CPPSRCS = nsWindowsShellService.cpp
else
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -41,17 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = chrome
LIBRARY_NAME = chrome_s
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
EXPORTS_NAMESPACES = mozilla/chrome
EXPORTS_mozilla/chrome = \
RegistryMessageUtils.h \
$(NULL)
CPPSRCS = \
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -74,17 +74,16 @@ endif
ifeq (,$(filter -DHAVE_SNPRINTF=1,$(ACDEFINES)))
CSRCS += snprintf.c
endif
endif # WINNT
LOCAL_INCLUDES = -I$(srcdir)/../include
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
ifeq ($(OS_ARCH),WINCE)
DEFINES += -D__STDC__ -DDBM_REOPEN_ON_FLUSH
endif
--- a/extensions/universalchardet/src/base/Makefile.in
+++ b/extensions/universalchardet/src/base/Makefile.in
@@ -73,12 +73,10 @@ CPPSRCS = \
nsSJISProber.cpp \
nsUTF8Prober.cpp \
nsLatin1Prober.cpp \
nsUniversalDetector.cpp \
$(NULL)
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -236,18 +236,16 @@ ifdef MOZ_ENABLE_CAIRO_FT
CSRCS += cairo-ft-font.c cairo-type1-subset.c
EXPORTS_cairo += cairo-ft.h
OS_INCLUDES += $(CAIRO_FT_CFLAGS)
endif
LOCAL_INCLUDES += -I$(srcdir)
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
# Disable spammy "missing initializer" GCC warning
ifdef GNU_CC
CFLAGS += -Wno-missing-field-initializers
endif # GNU_CC
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -166,18 +166,16 @@ DEFINES += -DUSE_ARM_NEON
ARM_NEON_CFLAGS = -mfpu=neon
endif
EXPORTS = pixman.h pixman-version.h
LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../../cairo/src
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
CFLAGS += -DPACKAGE="mozpixman" -D_USE_MATH_DEFINES
# Disable spammy "missing initializer" GCC warning
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -68,15 +68,13 @@ EXPORTS_harfbuzz = \
hb-ot-shape.h \
hb-shape.h \
hb-unicode.h \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DPACKAGE_VERSION="\"moz\""
DEFINES += -DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\""
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -74,18 +74,16 @@ CPPSRCS = \
EXPORTS = \
../include/opentype-sanitiser.h \
../include/ots-memory-stream.h \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DPACKAGE_VERSION="\"moz\""
DEFINES += -DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\""
DEFINES += -DNOMINMAX
# Suppress ANSI strict warnings
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -51,18 +51,16 @@ endif
endif
endif
# -pedantic causes warnings that we don't care about
# so turn it off
CFLAGS := $(filter-out -pedantic,$(CFLAGS))
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
CFLAGS += -DMOZ_QCMS
# Disable spammy "missing initializer" GCC warning
ifdef GNU_CC
CFLAGS += -Wno-missing-field-initializers
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = gfx
MODULE_NAME = nsGfxModule
LIBRARY_NAME = gkgfx
EXPORT_LIBRARY = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
XPIDLSRCS = \
nsIFontEnumerator.idl \
nsIScriptableRegion.idl \
$(NULL)
EXPORTS = \
gfxCore.h \
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -51,13 +51,11 @@ CPPSRCS = nsIconChannel.cpp
ifdef MOZ_ENABLE_GNOMEUI
LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
else
LOCAL_INCLUDES += $(MOZ_GTK2_CFLAGS)
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -47,18 +47,16 @@ LIBXUL_LIBRARY = 1
CPPSRCS = nsIconChannel.cpp
LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
DIRS = public
EXTRA_COMPONENTS = gtkqticonsconverter.manifest
EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
include $(topsrcdir)/config/rules.mk
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -66,17 +66,16 @@ EXPORTS = \
$(NULL)
CPPSRCS = \
nsUnicharUtils.cpp \
nsBidiUtils.cpp \
$(NULL)
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
USE_STATIC_LIBS = 1
LOCAL_INCLUDES += -I$(srcdir)/../src
include $(topsrcdir)/config/rules.mk
ifdef _MSC_VER
# Don't include directives about which CRT to use
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -59,16 +59,15 @@ EXTRA_DEPS += $(srcdir)/../objs.mk
LOCAL_INCLUDES += -I$(srcdir)/.. \
-I$(srcdir)/../../src
CPPSRCS = $(INTL_UNICHARUTIL_UTIL_LCPPSRCS)
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS): %: $(srcdir)/../%
$(INSTALL) $^ .
GARBAGE += $(INTL_UNICHARUTIL_UTIL_LCPPSRCS)
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -64,17 +64,15 @@ CPPSRCS= \
ifdef MOZ_XUL
CPPSRCS += \
inDOMView.cpp \
$(NULL)
endif
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
LOCAL_INCLUDES += \
-I$(srcdir)/../../style \
-I$(topsrcdir)/content/xbl/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -75,18 +75,16 @@ CSRCS += \
DEFINES += -DMOZ_PNG_READ \
-DMOZ_PNG_WRITE
EXPORTS = png.h pngconf.h mozpngconf.h
LOCAL_INCLUDES = -I$(srcdir)
FORCE_STATIC_LIB = 1
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
DEFINES += -DZLIB_DLL
ifdef BUILD_DEBUG_GC
DEFINES += -DDEBUG_GC
endif
--- a/modules/libreg/src/Makefile.in
+++ b/modules/libreg/src/Makefile.in
@@ -50,18 +50,16 @@ DIST_INSTALL = 1
CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) nr_bufio.c
BIN_SRCS = VerReg.c reg.c vr_stubs.c
PROGOBJS = $(addprefix R_,$(BIN_SRCS:.c=.o))
# We don't want a shared lib. Static lib only.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
# We do want this in the static libraries list
EXPORT_LIBRARY = 1
USE_STATIC_LIBS = 1
SDK_LIBRARY = $(LIBRARY)
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -52,12 +52,10 @@ DIST_INSTALL = 1
ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
DEFINES += -DZLIB_DLL=1
endif
CSRCS = $(MODULES_ZLIB_SRC_LCSRCS)
EXPORTS = zlib.h zconf.h mozzconf.h
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@@ -50,17 +50,16 @@ XPIDLSRCS = \
nsISyncJPAKE.idl \
$(NULL)
LIBRARY_NAME = services-crypto
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsServicesCryptoModule
LIBXUL_LIBRARY = 1
-FORCE_USE_PIC = 1
MOZILLA_INTERNAL_API = 1
CPPSRCS = \
nsSyncJPAKE.cpp \
$(NULL)
ifdef ENABLE_TESTS
DIRS += tests
--- a/toolkit/components/alerts/mac/growl/Makefile.in
+++ b/toolkit/components/alerts/mac/growl/Makefile.in
@@ -39,17 +39,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = alerts
LIBRARY_NAME = growl_s
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
CMSRCS = \
GrowlApplicationBridge.m \
GrowlPathUtilities.m \
$(NULL)
CSRCS = \
CFGrowlAdditions.c \
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -117,28 +117,26 @@ CPPSRCS += crashreporter_linux.cpp
endif
LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)
OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)
-FORCE_USE_PIC=1
endif
ifeq ($(OS_ARCH),SunOS)
CPPSRCS += crashreporter_linux.cpp crashreporter_unix.cpp
LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)
OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)
-FORCE_USE_PIC=1
endif
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),Darwin)
libs::
$(NSINSTALL) -D $(DIST)/bin/crashreporter.app
rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app
--- a/toolkit/crashreporter/fileid/Makefile.in
+++ b/toolkit/crashreporter/fileid/Makefile.in
@@ -54,15 +54,14 @@ HOST_CPPSRCS = \
HOST_LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)host_breakpad_linux_common_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
$(NULL)
# force C++ linking
CPP_PROG_LINK = 1
-FORCE_USE_PIC = 1
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
# due to them having an older libstdc++
HOST_LDFLAGS += -static
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
@@ -48,11 +48,10 @@ XPI_NAME = crashreporter
LOCAL_INCLUDES = -I$(srcdir)/..
CPPSRCS = \
minidump_file_writer.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
@@ -49,15 +49,14 @@ LOCAL_INCLUDES = -I$(topsrcdir)/toolkit
CPPSRCS = \
crash_generation_client.cc \
crash_generation_server.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),Linux)
# need this to suppress errors when compiling common/linux/eintr_wrapper.h
OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
endif
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -62,16 +62,15 @@ XPI_NAME = crashreporter
LOCAL_INCLUDES = -I$(srcdir)/../../..
CPPSRCS = \
exception_handler.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
ifeq ($(OS_TARGET),Android)
# NDK5 workarounds
DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES
endif
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
@@ -50,11 +50,10 @@ LOCAL_INCLUDES = -I$(srcdir)/../../..
CPPSRCS = \
linux_dumper.cc \
minidump_writer.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
@@ -50,11 +50,10 @@ LOCAL_INCLUDES = -I$(srcdir)/../../..
CPPSRCS = \
exception_handler.cc \
minidump_generator.cc \
solaris_lwp.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -85,11 +85,10 @@ endif
ifeq (Darwin,$(OS_ARCH))
HOST_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
endif
HOST_CSRCS = $(CSRCS)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
@@ -59,11 +59,10 @@ endif
HOST_CPPSRCS = \
dump_symbols.cc \
file_id.cc \
guid_creator.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
@@ -58,11 +58,10 @@ CPPSRCS = \
HOST_CPPSRCS = \
dump_symbols.cc \
file_id.cc \
guid_creator.cc \
$(NULL)
# need static lib
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
@@ -55,15 +55,14 @@ HOST_CPPSRCS = \
HOST_LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)host_breakpad_linux_common_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \
$(NULL)
# force C++ linking
CPP_PROG_LINK = 1
-FORCE_USE_PIC = 1
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
# due to them having an older libstdc++
HOST_LDFLAGS += -static
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
@@ -56,11 +56,10 @@ HOST_LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)host_breakpad_solaris_common_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
$(NULL)
HOST_LDFLAGS += -lelf -ldemangle
# force C++ linking
CPP_PROG_LINK = 1
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
ifdef MOZ_RDF
include $(topsrcdir)/rdf/util/src/objs.mk
endif
include $(topsrcdir)/intl/unicharutil/util/objs.mk
MODULE = libxul
LIBRARY_NAME = xul
-FORCE_USE_PIC = 1
FORCE_SHARED_LIB = 1
MOZILLA_INTERNAL_API = 1
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
# This is going to be a framework named "XUL", not an ordinary library named
# "libxul.dylib"
LIBRARY_NAME=XUL
# Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
--- a/widget/src/qt/faststartupqt/Makefile.in
+++ b/widget/src/qt/faststartupqt/Makefile.in
@@ -40,17 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = faststartupqt
LIBRARY_NAME = faststartupqt
DIST_INSTALL = 1
FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
STL_FLAGS=
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(XPCOM_FROZEN_LDOPTS) \
$(MOZ_QT_LIBS) \
$(NULL)
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -148,18 +148,16 @@ XPIDLSRCS = \
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
XPIDLSRCS += nsIMacUtils.idl
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -120,18 +120,16 @@ EXPORTS = \
EXPORTS_mozilla = \
XPCOM.h \
Services.h \
ServiceList.h \
Omnijar.h \
$(NULL)
-# Force use of PIC
-FORCE_USE_PIC = 1
GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
DEFINES += \
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -87,17 +87,15 @@ LOCAL_INCLUDES = \
-I.. \
-I$(topsrcdir)/chrome/src \
-I$(topsrcdir)/modules/libjar \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
endif
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -157,16 +157,14 @@ endif
EXTRA_COMPONENTS = \
nsINIProcessor.js \
nsINIProcessor.manifest \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../io
DEFINES += -D_IMPL_NS_COM
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -139,18 +139,16 @@ EXPORTS_mozilla/threads = \
SDK_LIBRARY = \
$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
# Pretend we're statically linking the CRT, even though we might not be: this
# avoids "msvcrp" and assembly dependencies from creeping into the directives
# for this library on Windows.
USE_STATIC_LIBS = 1
include $(topsrcdir)/config/rules.mk
--- a/xpcom/glue/nomozalloc/Makefile.in
+++ b/xpcom/glue/nomozalloc/Makefile.in
@@ -65,18 +65,16 @@ SDK_LIBRARY =
$(LIB_PREFIX)xpcomglue_s_nomozalloc.$(LIB_SUFFIX) \
$(NULL)
GARBAGE += $(CPPSRCS) DeadlockDetector.h SSE.h arm.h
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
# Pretend we're statically linking the CRT, even though we might not be: this
# avoids "msvcrp" and assembly dependencies from creeping into the directives
# for this library on Windows.
USE_STATIC_LIBS = 1
# Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
STL_FLAGS =
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -89,18 +89,16 @@ SDK_HEADERS = \
SDK_LIBRARY = \
$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
# Pretend we're statically linking the CRT, even though we might not be: this
# avoids "msvcrp" and assembly dependencies from creeping into the directives
# for this library on Windows.
USE_STATIC_LIBS = 1
# Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
STL_FLAGS =
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -176,18 +176,16 @@ SDK_HEADERS = \
nsDirectoryServiceUtils.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -D_IMPL_NS_COM
ifeq ($(OS_ARCH),Linux)
ifneq (,$(findstring lib64,$(libdir)))
--- a/xpcom/proxy/src/Makefile.in
+++ b/xpcom/proxy/src/Makefile.in
@@ -55,14 +55,12 @@ CPPSRCS = \
$(NULL)
DEFINES += -D_IMPL_NS_COM -DEXPORT_XPTC_API
LOCAL_INCLUDES += -I$(top_srcdir)/xpcom/threads/
# No shared lib; Force creation of static lib
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../../reflect/xptinfo/src
--- a/xpcom/reflect/xptcall/src/Makefile.in
+++ b/xpcom/reflect/xptcall/src/Makefile.in
@@ -49,16 +49,14 @@ MOZILLA_INTERNAL_API = 1
DIRS = md
CPPSRCS = xptcall.cpp
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DEXPORT_XPTC_API -D_IMPL_NS_COM
LOCAL_INCLUDES += -I$(srcdir)/../../xptinfo/src
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -52,18 +52,16 @@ CPPSRCS = \
xptcstubs_gcc_x86_os2.cpp \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../unix \
-I$(srcdir)/../../../../xptinfo/src \
$(NULL)
DEFINES += -DMOZ_NEED_LEADING_UNDERSCORE
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/config.mk
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -48,18 +48,16 @@ LIBRARY_NAME = xptcmd
EXPORT_LIBRARY = ../..
MOZILLA_INTERNAL_API = 1
#
# The default is this buildable, but non-functioning code.
#
CPPSRCS = $(error XPTCall not implemented on this platform!)
-# Force use of PIC
-FORCE_USE_PIC = 1
ifeq ($(OS_ARCH),SunOS)
ifneq (86,$(findstring 86,$(OS_TEST)))
# disable PGO for this directory with Sun Studio on SPARC because
# compiling with xprofile=collect will insert code into nsXPTCStubBase::Stub##n
NO_PROFILE_GUIDED_OPTIMIZE = 1
endif
endif
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -68,18 +68,16 @@ endif
CPPSRCS = xptcinvoke.cpp xptcstubs.cpp
endif
LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/config.mk
ifeq ($(TARGET_CPU),x86_64)
ifndef GNU_CXX
CPPSRCS := xptcinvoke_x86_64.cpp xptcstubs_x86_64.cpp
ASFILES := xptcinvoke_asm_x86_64.asm xptcstubs_asm_x86_64.asm
else #!GNU_CXX
--- a/xpcom/reflect/xptinfo/src/Makefile.in
+++ b/xpcom/reflect/xptinfo/src/Makefile.in
@@ -52,17 +52,15 @@ CPPSRCS = \
xptiInterfaceInfoManager.cpp \
xptiTypelibGuts.cpp \
xptiWorkingSet.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
# For nsManifestLineReader class.
LOCAL_INCLUDES = -I$(srcdir)/../../../ds
DEFINES += -DEXPORT_XPT_API -D_IMPL_NS_COM
--- a/xpcom/string/src/Makefile.in
+++ b/xpcom/string/src/Makefile.in
@@ -62,18 +62,16 @@ CPPSRCS = \
nsStringComparator.cpp \
nsStringObsolete.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
# Are we targeting x86 or x86-64? If so, compile the SSE2 functions for
# nsUTF8Utils.cpp.
ifneq (,$(INTEL_ARCHITECTURE))
CPPSRCS += nsUTF8UtilsSSE2.cpp
endif
include $(topsrcdir)/config/rules.mk
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -62,18 +62,16 @@ CPPSRCS = nsXPComStub.cpp
# If we have an import library, then copy that to the SDK. Otherwise,
# copy the shared library.
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
SDK_LIBRARY = $(IMPORT_LIBRARY)
else
SDK_LIBRARY = $(SHARED_LIBRARY)
endif
-# Force use of PIC
-FORCE_USE_PIC = 1
FORCE_SHARED_LIB = 1
EXTRA_DSO_LDOPTS = $(LIBS_DIR)
DEPENDENT_LIBS_LIST += \
$(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
$(DLL_PREFIX)plc4$(DLL_SUFFIX) \
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -81,15 +81,13 @@ XPIDLSRCS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
LOCAL_INCLUDES = -I$(srcdir)/../components
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -53,18 +53,16 @@ endif
CSRCS = xpt_arena.c xpt_struct.c xpt_xdr.c
HOST_CSRCS = $(CSRCS)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
-# Force use of PIC
-FORCE_USE_PIC = 1
# Don't use profile-guided optimization
NO_PROFILE_GUIDED_OPTIMIZE = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DEXPORT_XPT_API
HOST_CFLAGS += -DEXPORT_XPT_API
