rebase

bug1240930-253/mozilla/1429875-4-61a1.patch

@@ -713,7 +713,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  ##############################################
  ifneq (1,$(NO_PROFILE_GUIDED_OPTIMIZE))
  ifdef MOZ_PROFILE_USE
-@@ -525,35 +527,35 @@ distclean::
+@@ -525,36 +527,35 @@ distclean::
  	$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
  	$(wildcard *.$(IMPORT_LIB_SUFFIX))
  
@@ -742,17 +742,18 @@ diff --git a/config/rules.mk b/config/rules.mk
  	$(REPORT_BUILD)
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
--	$(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-+	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS
+-	       $(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
+-
++	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  ifdef MSMANIFEST_TOOL
- 	       if test -f '$(srcdir)/$(notdir $@).manifest'; then \
-                        echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \
-                        $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
+ 	@if test -f $@.manifest; then \
+ 		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
+ 			echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \
+ 			$(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
  		else \
  			echo 'Embedding manifest from $@.manifest'; \
  			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
- 		fi; \
-@@ -563,140 +565,133 @@ ifdef MSMANIFEST_TOOL
+@@ -565,140 +566,133 @@ ifdef MSMANIFEST_TOOL
  	fi
  endif	# MSVC with manifest tool
  ifdef MOZ_PROFILE_GENERATE
@@ -869,7 +870,7 @@ diff --git a/config/rules.mk b/config/rules.mk
 -	$(if $(filter %.$(LIB_SUFFIX),$(LIBRARY)),,$(RM) $(REAL_LIBRARY))
 -	$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(STATIC_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))
 +	$(RM) $(REAL_LIBRARY)
-+       $(AR) $(AR_FLAGS) $(OBJS) $($@_OBJS)
++	$(AR) $(AR_FLAGS) $(OBJS) $($@_OBJS)
  
  ifeq ($(OS_ARCH),WINNT)
  # Import libraries are created by the rules creating shared libraries.

bug1240930-253/mozilla/1429875-5-61a1.patch

@@ -52,17 +52,17 @@ diff --git a/config/rules.mk b/config/rules.mk
  	$(REPORT_BUILD)
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
--	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS
+-	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
 +	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  ifdef MSMANIFEST_TOOL
- 	       if test -f '$(srcdir)/$(notdir $@).manifest'; then \
-                        echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \
-                        $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
+ 	@if test -f $@.manifest; then \
+ 		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
+ 			echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \
+ 			$(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
  		else \
  			echo 'Embedding manifest from $@.manifest'; \
  			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
- 		fi; \
-@@ -565,17 +565,17 @@ ifdef MSMANIFEST_TOOL
+@@ -566,17 +566,17 @@ ifdef MSMANIFEST_TOOL
  	fi
  endif	# MSVC with manifest tool
  ifdef MOZ_PROFILE_GENERATE
@@ -81,7 +81,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  endif
  ifdef MOZ_POST_PROGRAM_COMMAND
  	$(MOZ_POST_PROGRAM_COMMAND) $@
-@@ -616,25 +616,25 @@ endif
+@@ -617,25 +617,25 @@ endif
  # Foo.o (from either Foo.c or Foo.cpp).
  #
  # SIMPLE_PROGRAMS = Foo Bar
@@ -109,7 +109,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  endif
  ifdef MOZ_POST_PROGRAM_COMMAND
  	$(MOZ_POST_PROGRAM_COMMAND) $@
-@@ -653,17 +653,17 @@ endif
+@@ -654,17 +654,17 @@ endif
  endif
  ifndef CROSS_COMPILE
  	$(call py_action,check_binary,--host $@)
@@ -118,7 +118,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  $(LIBRARY): $(OBJS) $(STATIC_LIBS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
  	$(RM) $(REAL_LIBRARY)
--       $(AR) $(AR_FLAGS) $(OBJS) $($@_OBJS)
+-	$(AR) $(AR_FLAGS) $(OBJS) $($@_OBJS)
 +	$(AR) $(AR_FLAGS) $(OBJS) $($@_$(OBJS_VAR_SUFFIX))
  
  ifeq ($(OS_ARCH),WINNT)
@@ -128,7 +128,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  # when rebuilding the corresponding shared library. Defining an empty recipe
  # for import libraries forces make to wait for the shared library recipe to
  # have run before considering other targets that depend on the import library.
-@@ -681,17 +681,17 @@ endif
+@@ -682,17 +682,17 @@ endif
  # symlinks back to the originals. The symlinks are a no-op for stabs debugging,
  # so no need to conditionalize on OS version or debugging format.