CWS-TOOLING: rebase CWS cmcfixes64 to trunk@277035 (milestone: DEV300:m62)

3 files changed, 94 insertions, 71 deletions

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 43a087e950ca..26bc88c80146 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -45,9 +45,9 @@ all:
     @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
 .ENDIF	
 
-TARFILE_NAME=nss_3_12_3
+TARFILE_NAME=nss_3_12_4
 TARFILE_ROOTDIR=mozilla
-PATCH_FILES=nss_3_12_3.patch
+PATCH_FILES=nss.patch
 
 .IF "$(debug)" != ""
 .ELSE
@@ -58,9 +58,6 @@ BUILD_OPT=1
 
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)$(COM)"=="LINUXGCC"
-#LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
-.EXPORT: LDFLAGS
-
 .IF "$(BUILD64)"=="1"
 # force 64-bit buildmode
 USE_64:=1
@@ -90,7 +87,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all
 
 .IF "$(COM)"=="GCC"
 
-PATCH_FILES+=nss_3_12_3.patch.mingw
+PATCH_FILES+=nss.patch.mingw
 
 moz_build:=$(shell cygpath -p $(MOZILLABUILD))
 PATH!:=$(moz_build)/bin:$(PATH)
diff --git a/nss/nss_3_12_3.patch b/nss/nss.patch
index de1ff8c41bc8..d37d892dd6b8 100755..100644
--- a/nss/nss_3_12_3.patch
+++ b/nss/nss.patch
@@ -1,6 +1,6 @@
---- misc/mozilla/nsprpub/config/rules.mk	Tue Mar 24 23:49:17 2009
-+++ misc/build/mozilla/nsprpub/config/rules.mk	Mon Jun 29 15:45:22 2009
-@@ -363,7 +363,11 @@
+--- misc/mozilla/nsprpub/config/rules.mk	2009-05-02 01:08:01.000000000 +0200
++++ misc/build/mozilla/nsprpub/config/rules.mk	2009-09-17 10:29:39.823155149 +0200
+@@ -350,7 +350,12 @@
  ifdef NS_USE_GCC
  	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
  else
@@ -10,12 +10,13 @@
 +        #rc will use the stl from the system if the path is in the INCLUDE
 +        #variable.
 +	INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
++
  endif # GCC
  	@echo $(RES) finished
  endif
---- misc/mozilla/nsprpub/configure	Fri Dec  5 01:46:50 2008
-+++ misc/build/mozilla/nsprpub/configure	Mon Jun 29 15:28:52 2009
-@@ -3905,7 +3905,7 @@
+--- misc/mozilla/nsprpub/configure	2009-05-08 15:12:31.000000000 +0200
++++ misc/build/mozilla/nsprpub/configure	2009-09-17 10:31:55.064081763 +0200
+@@ -3898,7 +3898,7 @@
      PR_MD_CSRCS=linux.c
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
@@ -24,25 +25,25 @@
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
---- misc/mozilla/security/coreconf/Darwin.mk	Fri Mar 20 08:19:35 2009
-+++ misc/build/mozilla/security/coreconf/Darwin.mk	Mon Jun 29 15:28:52 2009
-@@ -38,9 +38,12 @@
- include $(CORE_DEPTH)/coreconf/UNIX.mk
+--- misc/mozilla/security/coreconf/Darwin.mk	2009-07-30 23:36:02.000000000 +0200
++++ misc/build/mozilla/security/coreconf/Darwin.mk	2009-09-17 11:11:36.442683705 +0200
+@@ -39,8 +39,12 @@
  
  DEFAULT_COMPILER = cc
+ 
+-CC		= cc
+-CCC		= c++
 +# CC is taken from environment automatically.
 +#CC		= cc
 +# Use CCC from environment.
 +#CCC		= c++
 +CCC		= $(CXX)
- 
--CC		= cc
--CCC		= c++
++
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
---- misc/mozilla/security/coreconf/Linux.mk	Sat Sep  6 01:17:23 2008
-+++ misc/build/mozilla/security/coreconf/Linux.mk	Mon Jun 29 15:28:52 2009
+--- misc/mozilla/security/coreconf/Linux.mk	2009-07-30 01:43:41.000000000 +0200
++++ misc/build/mozilla/security/coreconf/Linux.mk	2009-09-17 10:39:40.372245066 +0200
 @@ -46,8 +46,11 @@
  	IMPL_STRATEGY = _PTH
  endif
@@ -57,18 +58,18 @@
  RANLIB			= ranlib
  
  DEFAULT_COMPILER = gcc
-@@ -174,7 +177,7 @@
- ARCH			= linux
- 
- DSO_CFLAGS		= -fPIC
--DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,-z,defs
-+DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,-z,defs  '-Wl,-rpath,$$ORIGIN'
+@@ -149,7 +152,7 @@
+ # incorrectly reports undefined references in the libraries we link with, so
+ # we don't use -z defs there.
+ ZDEFS_FLAG		= -Wl,-z,defs
+-DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
++DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN'
  DSO_LDFLAGS		=
  LDFLAGS			+= $(ARCHFLAG)
  
---- misc/mozilla/security/coreconf/SunOS5.mk	Thu Nov 22 05:39:56 2007
-+++ misc/build/mozilla/security/coreconf/SunOS5.mk	Mon Jun 29 15:28:52 2009
-@@ -89,8 +89,11 @@
+--- misc/mozilla/security/coreconf/SunOS5.mk	2009-06-11 02:55:32.000000000 +0200
++++ misc/build/mozilla/security/coreconf/SunOS5.mk	2009-09-17 10:42:17.845459669 +0200
+@@ -89,8 +89,12 @@
  	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
  	endif
  else
@@ -79,12 +80,13 @@
 +# Use CXX from environment.
 +#	CCC        = CC
 +        CCC       = $(CXX)
++
  	ASFLAGS   += -Wa,-P
  	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
  	ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/arch.mk	Wed Mar 11 19:54:24 2009
-+++ misc/build/mozilla/security/coreconf/arch.mk	Mon Jun 29 15:28:52 2009
-@@ -329,8 +329,14 @@
+--- misc/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
++++ misc/build/mozilla/security/coreconf/arch.mk	2009-09-17 10:45:27.710858021 +0200
+@@ -324,7 +324,12 @@
  # IMPL_STRATEGY may be defined too.
  #
  
@@ -96,13 +98,11 @@
 +#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
 +OBJDIR_NAME = out
  
-+
  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  ifndef BUILD_OPT
- #
---- misc/mozilla/security/coreconf/rules.mk	Wed Jan 21 00:30:57 2009
-+++ misc/build/mozilla/security/coreconf/rules.mk	Mon Jun 29 15:47:42 2009
-@@ -359,7 +359,11 @@
+--- misc/mozilla/security/coreconf/rules.mk	2009-08-11 05:23:39.000000000 +0200
++++ misc/build/mozilla/security/coreconf/rules.mk	2009-09-17 10:48:07.361462582 +0200
+@@ -355,7 +355,12 @@
  ifdef NS_USE_GCC
  	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
  else
@@ -112,20 +112,45 @@
 +        #rc will use the stl from the system if the path is in the INCLUDE
 +        #variable.
 +	INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
++
  endif
  	@echo $(RES) finished
  endif
---- misc/mozilla/security/nss/cmd/platlibs.mk	Wed Dec  3 00:24:46 2008
-+++ misc/build/mozilla/security/nss/cmd/platlibs.mk	Mon Jun 29 15:28:52 2009
-@@ -52,9 +52,9 @@
+--- misc/mozilla/security/nss/cmd/platlibs.mk	2009-06-18 01:01:48.000000000 +0200
++++ misc/build/mozilla/security/nss/cmd/platlibs.mk	2009-09-17 11:08:16.697236076 +0200
+@@ -41,27 +41,28 @@
+ ifeq ($(OS_ARCH), SunOS) 
+ ifeq ($(BUILD_SUN_PKG), 1)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
++#In OOo we would probable put the executables next to libs
++EXTRA_SHARED_LIBS += -R '$$ORIGIN'
+ else
+-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
++EXTRA_SHARED_LIBS += -R '$$ORIGIN'
+ endif
+ else
+-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
++EXTRA_SHARED_LIBS += -R '$$ORIGIN'
+ endif
+ endif
  
  ifeq ($(OS_ARCH), Linux)
+ ifeq ($(BUILD_SUN_PKG), 1)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
+ endif
+ else
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN'
++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
  else
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
 +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
  endif
  endif
- 
+ endif
diff --git a/nss/nss_3_12_3.patch.mingw b/nss/nss.patch.mingw
index 942b44c6997f..bead79548d6e 100644
--- a/nss/nss_3_12_3.patch.mingw
+++ b/nss/nss.patch.mingw
@@ -1,5 +1,5 @@
---- misc/mozilla/nsprpub/config/autoconf.mk.in	2007-06-10 01:28:46.000000000 +0900
-+++ misc/build/mozilla/nsprpub/config/autoconf.mk.in	2009-07-26 19:50:43.845875000 +0900
+--- misc/mozilla/nsprpub/config/autoconf.mk.in	2009-03-03 23:04:23.000000000 +0100
++++ misc/build/mozilla/nsprpub/config/autoconf.mk.in	2009-09-18 17:24:12.042630830 +0200
 @@ -22,6 +22,7 @@
  RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
  OBJDIR_NAME	= @OBJDIR_NAME@
@@ -8,12 +8,12 @@
  OBJ_SUFFIX	= @OBJ_SUFFIX@
  LIB_SUFFIX	= @LIB_SUFFIX@
  DLL_SUFFIX	= @DLL_SUFFIX@
---- misc/mozilla/nsprpub/config/rules.mk	2009-03-25 07:49:17.000000000 +0900
-+++ misc/build/mozilla/nsprpub/config/rules.mk	2009-07-26 19:50:44.002125000 +0900
+--- misc/mozilla/nsprpub/config/rules.mk	2009-05-02 01:08:01.000000000 +0200
++++ misc/build/mozilla/nsprpub/config/rules.mk	2009-09-18 17:24:52.422809433 +0200
 @@ -113,9 +113,9 @@
  # other platforms do not.
  #
- ifeq (,$(filter-out WIN95 OS2,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN95 WINCE OS2,$(OS_TARGET)))
 -LIBRARY		= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
 +LIBRARY		= $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
  SHARED_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
@@ -22,9 +22,9 @@
  SHARED_LIB_PDB	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
  else
  LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
---- misc/mozilla/nsprpub/configure	2008-12-05 09:46:50.000000000 +0900
-+++ misc/build/mozilla/nsprpub/configure	2009-07-26 19:50:45.158375000 +0900
-@@ -2767,6 +2767,7 @@
+--- misc/mozilla/nsprpub/configure	2009-05-08 15:12:31.000000000 +0200
++++ misc/build/mozilla/nsprpub/configure	2009-09-18 17:25:50.277803372 +0200
+@@ -2770,6 +2770,7 @@
  LIB_SUFFIX=a
  DLL_SUFFIX=so
  ASM_SUFFIX=s
@@ -32,7 +32,7 @@
  MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
  PR_MD_ASFILES=
  PR_MD_CSRCS=
-@@ -4005,6 +4006,7 @@
+@@ -3998,6 +3999,7 @@
          OBJ_SUFFIX=obj
          LIB_SUFFIX=lib
          DLL_SUFFIX=dll
@@ -40,7 +40,7 @@
  
          # Determine compiler version
          CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' -e 's| .*||'`
-@@ -6169,6 +6171,7 @@
+@@ -6291,6 +6293,7 @@
  s%@LIB_SUFFIX@%$LIB_SUFFIX%g
  s%@DLL_SUFFIX@%$DLL_SUFFIX%g
  s%@ASM_SUFFIX@%$ASM_SUFFIX%g
@@ -48,8 +48,8 @@
  s%@MKSHLIB@%$MKSHLIB%g
  s%@DSO_CFLAGS@%$DSO_CFLAGS%g
  s%@DSO_LDOPTS@%$DSO_LDOPTS%g
---- misc/mozilla/nsprpub/pr/src/Makefile.in	2008-06-08 05:25:59.000000000 +0900
-+++ misc/build/mozilla/nsprpub/pr/src/Makefile.in	2009-07-26 20:57:15.324875000 +0900
+--- misc/mozilla/nsprpub/pr/src/Makefile.in	2009-02-04 23:47:01.000000000 +0100
++++ misc/build/mozilla/nsprpub/pr/src/Makefile.in	2009-09-18 17:26:33.544145410 +0200
 @@ -195,7 +195,7 @@
  
  ifeq ($(OS_ARCH),WINNT)
@@ -59,8 +59,8 @@
  else
  OS_LIBS		= advapi32.lib wsock32.lib winmm.lib
  endif
---- misc/mozilla/security/coreconf/WIN32.mk	2009-04-01 09:49:48.000000000 +0900
-+++ misc/build/mozilla/security/coreconf/WIN32.mk	2009-07-26 19:50:45.252125000 +0900
+--- misc/mozilla/security/coreconf/WIN32.mk	2009-07-29 02:15:46.000000000 +0200
++++ misc/build/mozilla/security/coreconf/WIN32.mk	2009-09-18 17:27:39.253588269 +0200
 @@ -43,8 +43,8 @@
  DEFAULT_COMPILER = cl
  
@@ -72,8 +72,8 @@
  	LINK         = ld
  	AR           = ar
  	AR          += cr $@
---- misc/mozilla/security/coreconf/WIN95.mk	2009-02-14 14:51:10.000000000 +0900
-+++ misc/build/mozilla/security/coreconf/WIN95.mk	2009-07-26 19:50:45.377125000 +0900
+--- misc/mozilla/security/coreconf/WIN95.mk	2009-02-14 06:51:10.000000000 +0100
++++ misc/build/mozilla/security/coreconf/WIN95.mk	2009-09-18 17:28:06.433136076 +0200
 @@ -44,4 +44,8 @@
  DEFINES += -DWIN95
  
@@ -84,8 +84,9 @@
 +else
 +  NSPR31_LIB_PREFIX = $(NULL)
 +endif
---- misc/mozilla/security/coreconf/rules.mk	2009-01-21 08:30:57.000000000 +0900
-+++ misc/build/mozilla/security/coreconf/rules.mk	2009-07-26 19:50:45.689625000 +0900
+\ No newline at end of file
+--- misc/mozilla/security/coreconf/rules.mk	2009-08-11 05:23:39.000000000 +0200
++++ misc/build/mozilla/security/coreconf/rules.mk	2009-09-18 17:29:05.079376677 +0200
 @@ -281,8 +281,12 @@
  	fi
  endif	# MSVC with manifest tool
@@ -99,8 +100,8 @@
  
  get_objs:
  	@echo $(OBJS)
---- misc/mozilla/security/nss/Makefile	2008-12-03 08:24:39.000000000 +0900
-+++ misc/build/mozilla/security/nss/Makefile	2009-07-26 19:50:45.845875000 +0900
+--- misc/mozilla/security/nss/Makefile	2008-12-03 00:24:39.000000000 +0100
++++ misc/build/mozilla/security/nss/Makefile	2009-09-18 17:29:46.194949392 +0200
 @@ -108,7 +108,7 @@
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
@@ -110,8 +111,8 @@
  endif
  
  #
---- misc/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 09:17:21.000000000 +0900
-+++ misc/build/mozilla/security/nss/cmd/crmftest/Makefile	2009-07-26 19:50:45.970875000 +0900
+--- misc/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 01:17:21.000000000 +0100
++++ misc/build/mozilla/security/nss/cmd/crmftest/Makefile	2009-09-18 17:30:33.267190024 +0200
 @@ -90,7 +90,7 @@
  LDDIST = $(DIST)/lib
  
@@ -121,9 +122,9 @@
  endif
  
  include ../platrules.mk
---- misc/mozilla/security/nss/cmd/shlibsign/Makefile	2008-11-21 00:44:11.000000000 +0900
-+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile	2009-07-26 22:58:48.687625000 +0900
-@@ -112,10 +112,16 @@
+--- misc/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-07 21:06:37.000000000 +0200
++++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile	2009-09-18 17:31:02.168253398 +0200
+@@ -115,10 +115,16 @@
  	$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
  	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
  else
@@ -140,8 +141,8 @@
  
  libs install :: $(CHECKLOC)
  
---- misc/mozilla/security/nss/lib/freebl/config.mk	2009-02-03 06:57:23.000000000 +0900
-+++ misc/build/mozilla/security/nss/lib/freebl/config.mk	2009-07-26 19:50:46.127125000 +0900
+--- misc/mozilla/security/nss/lib/freebl/config.mk	2009-04-11 23:18:42.000000000 +0200
++++ misc/build/mozilla/security/nss/lib/freebl/config.mk	2009-09-18 17:31:40.067954076 +0200
 @@ -84,10 +84,6 @@
  RES     = $(OBJDIR)/$(LIBRARY_NAME).res
  RESNAME = freebl.rc
@@ -153,7 +154,7 @@
  ifdef NS_USE_GCC
  EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
-@@ -96,6 +92,10 @@
+@@ -97,6 +93,10 @@
  	-lnspr4 \
  	$(NULL)
  else # ! NS_USE_GCC