bug 335180 Remove win32.order, mozilla-bin.order, --enable-reorder, and

associated code. These options do not really work anymore.

r=bsmedberg

config/autoconf.mk.in

@@ -173,7 +173,6 @@ MOZ_FIX_LINK_PATHS=@MOZ_FIX_LINK_PATHS@
 
 XPCOM_FROZEN_LDOPTS=@XPCOM_FROZEN_LDOPTS@
 XPCOM_LIBS=@XPCOM_LIBS@
-MOZ_REORDER=@MOZ_REORDER@
 MOZ_TIMELINE=@MOZ_TIMELINE@
 
 ENABLE_STRIP	= @ENABLE_STRIP@
@@ -542,7 +541,6 @@ MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
 
 # Win32 options
 MOZ_PROFILE	= @MOZ_PROFILE@
-MOZ_COVERAGE	= @MOZ_COVERAGE@
 MOZ_BROWSE_INFO	= @MOZ_BROWSE_INFO@
 MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
 MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@

config/config.mk

@@ -221,7 +221,7 @@ OS_CFLAGS += $(_DEBUG_CFLAGS)
 OS_CXXFLAGS += $(_DEBUG_CFLAGS)
 OS_LDFLAGS += $(_DEBUG_LDFLAGS)
 
-# MOZ_PROFILE & MOZ_COVERAGE equivs for win32
+# MOZ_PROFILE equivs for win32
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 ifdef MOZ_DEBUG
 ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
@@ -253,17 +253,6 @@ WIN32_EXE_LDFLAGS += -FIXED:NO
 OS_LDFLAGS += -OPT:NOICF
 endif
 
-# if MOZ_COVERAGE is set, we handle pdb files slightly differently
-ifdef MOZ_COVERAGE
-MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG
-OS_LDFLAGS = -DEBUG -PDB:NONE -OPT:REF -OPT:nowin98
-_ORDERFILE := $(wildcard $(srcdir)/win32.order)
-ifneq (,$(_ORDERFILE))
-OS_LDFLAGS += -ORDER:@$(srcdir)/win32.order
-endif
-endif
-# MOZ_COVERAGE
-
 #
 # Handle trace-malloc in optimized builds.
 # No opt to give sane callstacks.
@@ -278,15 +267,6 @@ endif # MOZ_DEBUG
 endif # WINNT && !GNU_CC
 
 
-#
-# -ffunction-sections is needed to reorder functions using a GNU ld
-# script.
-#
-ifeq ($(MOZ_REORDER),1)
-  OS_CFLAGS += -ffunction-sections
-  OS_CXXFLAGS += -ffunction-sections
-endif
-
 # If we're applying MOZ_PROFILE_GENERATE to a non-static build, then we
 # need to create a static build _with_ PIC.  This allows us to generate
 # profile data that will still be valid when the object files are linked into

config/rules.mk

@@ -1809,7 +1809,7 @@ FORCE:
 # so the files must be built serially
 # This requires a recent version of gmake 
 ifeq ($(OS_ARCH),WINNT)
-ifneq (,$(MOZ_DEBUG)$(MOZ_PROFILE)$(MOZ_COVERAGE))
+ifneq (,$(MOZ_DEBUG)$(MOZ_PROFILE))
 .NOTPARALLEL::
 endif
 endif

configure.in

@@ -4348,7 +4348,6 @@ MOZ_PYTHON_PREFIX=
 MOZ_PYTHON_VER=
 MOZ_PYTHON_VER_DOTTED=
 MOZ_REFLOW_PERF=
-MOZ_REORDER=
 MOZ_SAFE_BROWSING=
 MOZ_SINGLE_PROFILE=
 MOZ_STATIC_MAIL_BUILD=
@@ -6020,21 +6019,6 @@ else
     AC_DEFINE(MOZ_LOGGING)
 fi
 
-dnl ========================================================
-dnl = Enable function reordering. Off by default
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(reorder,
-[  --enable-reorder        Enable function reordering (requires GNU ld) ],
-    _ENABLE_REORDER=1,
-    _ENABLE_REORDER= )
-if test -n "$_ENABLE_REORDER"; then
-    if test -z "$GNU_LD"; then
-        AC_MSG_WARN([Reordering only works with GNU ld. Not reordering.])
-    else
-        MOZ_REORDER=1
-    fi
-fi
-
 dnl ========================================================
 dnl = dnl This will enable logging of addref, release, ctor, dtor.
 dnl ========================================================
@@ -7434,7 +7418,6 @@ AC_SUBST(MOZ_OS2_USE_DECLSPEC)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
-AC_SUBST(MOZ_REORDER)
 AC_SUBST(MOZ_TIMELINE)
 AC_SUBST(WINCE)
 AC_SUBST(TARGET_DEVICE)
@@ -7456,7 +7439,6 @@ AC_SUBST(MOZ_MILESTONE_RELEASE)
 dnl win32 options
 AC_SUBST(MOZ_PROFILE)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
-AC_SUBST(MOZ_COVERAGE)
 AC_SUBST(MOZ_MAPINFO)
 AC_SUBST(MOZ_BROWSE_INFO)
 AC_SUBST(MOZ_TOOLS_DIR)

xpfe/bootstrap/Makefile.in

@@ -457,20 +457,6 @@ $(EXE_DEF_FILE):
 endif
 endif
 
-ifeq ($(MOZ_REORDER),1)
-
-LDSCRIPT = ldscript
-LDFLAGS += -Wl,-T,$(LDSCRIPT)
-GARBAGE += $(LDSCRIPT)
-ORDERFILE = $(srcdir)/mozilla-bin.order
-
-$(PROGRAM) : $(LDSCRIPT) $(ORDERFILE)
-
-$(LDSCRIPT): $(ORDERFILE)
-	$(PERL) $(topsrcdir)/config/mklinkscript.pl -o $@ $<
-
-endif
-
 libs::
 	touch $(DIST)/bin/.autoreg