Bug 407399 - Disable prebinding for trunk builds, drop support from comm-central tree part, r=kairo
authorPhil Ringnalda <philringnalda@gmail.com>
Sat, 11 Oct 2008 21:15:30 -0700
changeset 589 5d4a98ac7867521822c4ee4d88810199be8b331c
parent 588 b990b5896c4835544831ac37b145ae972fe07f89
child 590 a0784e1ef1fc7fb7f5592106f15546204d2e4c36
push idunknown
push userunknown
push dateunknown
reviewerskairo
bugs407399
Bug 407399 - Disable prebinding for trunk builds, drop support from comm-central tree part, r=kairo
calendar/sunbird/app/Makefile.in
config/autoconf.mk.in
config/config.mk
configure.in
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -223,19 +223,16 @@ DEFINES += -DSUNBIRD_ICO=\"$(DIST)/brand
 
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
 LIBS	+= -framework QuickTime -framework IOKit
-ifdef USE_PREBINDING
-BIN_FLAGS += -Wl,-headerpad -Wl,5a0c
-endif
 endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
 LIBS += -lphexlib
 endif
 
 ifeq ($(OS_ARCH),WINNT)
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -107,17 +107,16 @@ DEHYDRA_PATH    = @DEHYDRA_PATH@
 
 MOZ_XPCTOOLS    = @MOZ_XPCTOOLS@
 ENABLE_EAZEL_PROFILER=@ENABLE_EAZEL_PROFILER@
 EAZEL_PROFILER_CFLAGS=@EAZEL_PROFILER_CFLAGS@
 EAZEL_PROFILER_LIBS=@EAZEL_PROFILER_LIBS@
 GC_LEAK_DETECTOR = @GC_LEAK_DETECTOR@
 NS_TRACE_MALLOC = @NS_TRACE_MALLOC@
 USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
-USE_PREBINDING = @USE_PREBINDING@
 INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
 MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
 MOZ_CALENDAR	= @MOZ_CALENDAR@
 MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 MOZ_COMPOSER = @MOZ_COMPOSER@
 BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
 MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
--- a/config/config.mk
+++ b/config/config.mk
@@ -651,20 +651,16 @@ ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 ifdef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
 ELF_DYNSTR_GC 	= $(MOZDEPTH)/config/elf-dynstr-gc
 endif
 endif
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-ifdef USE_PREBINDING
-export LD_PREBIND=1
-export LD_SEG_ADDR_TABLE=$(shell cd $(MOZILLA_SRCDIR); pwd)/config/prebind-address-table
-endif # USE_PREBINDING
 ifdef NEXT_ROOT
 export NEXT_ROOT
 PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
 else # NEXT_ROOT
 PBBUILD = $(PBBUILD_BIN)
 endif # NEXT_ROOT
 PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build ARCHS="$(OS_TEST)"
 ifdef MACOS_SDK_DIR
--- a/configure.in
+++ b/configure.in
@@ -6075,24 +6075,16 @@ if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAP
     AC_LANG_CPLUSPLUS
     AC_CHECK_FUNCS(__builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual)
     AC_LANG_RESTORE
     AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
 fi
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
-dnl = --enable-prebinding
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(prebinding,
-[  --enable-prebinding     Enable prebinding (Mac OS X only)],
-    USE_PREBINDING=1,
-    USE_PREBINDING= )
-
-dnl ========================================================
 dnl = 
 dnl = Profiling and Instrumenting
 dnl = 
 dnl ========================================================
 MOZ_ARG_HEADER(Profiling and Instrumenting)
 
 dnl ========================================================
 dnl = Enable timeline service, which provides lightweight
@@ -7196,17 +7188,16 @@ AC_SUBST(MOZ_VIEW_SOURCE)
 AC_SUBST(MOZ_SPELLCHECK)
 AC_SUBST(MOZ_XPFE_COMPONENTS)
 AC_SUBST(MOZ_USER_DIR)
 AC_SUBST(MOZ_CRASHREPORTER)
 
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(USE_ELF_DYNSTR_GC)
-AC_SUBST(USE_PREBINDING)
 AC_SUBST(INCREMENTAL_LINKER)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
 AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
 AC_SUBST(MOZ_XPCOM_OBSOLETE_LIBS)
 
 AC_SUBST(MOZ_FIX_LINK_PATHS)
 AC_SUBST(XPCOM_LIBS)
 AC_SUBST(XPCOM_FROZEN_LDOPTS)