diff -cr mozilla-central.org/configure mozilla-central/configure
*** mozilla-central.org/configure	Thu Dec 11 04:12:08 2008
--- mozilla-central/configure	Thu Feb 12 14:11:44 2009
***************
*** 3018,3023 ****
--- 3018,3036 ----
          CXX_VERSION=`"${CXX}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`
          _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'`
  
+ 	if test "$CC" == "icl"; then
+             CC_VERSION=15.00.21022.08
+             _CC_MAJOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $1 }'`
+             _CC_MINOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $2 }'`
+             _CC_RELEASE=`echo ${CC_VERSION} | $AWK -F\. '{ print $3 }'`
+             _CC_BUILD=`echo ${CC_VERSION} | $AWK -F\. '{ print $4 }'`
+             _MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}
+ 
+             CXX_VERSION=15.00.21022.08
+             _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'`
+ 	fi
+ 
+ 
          if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
              { echo "configure: error: The major versions of \$CC and \$CXX do not match." 1>&2; exit 1; }
          fi
***************
*** 6486,6492 ****
          HOST_CC='$(CC)'
          HOST_CXX='$(CXX)'
          HOST_LD='$(LD)'
!         AR='lib -NOLOGO -OUT:"$@"'
          AR_FLAGS=
          RANLIB='echo not_ranlib'
          STRIP='echo not_strip'
--- 6499,6509 ----
          HOST_CC='$(CC)'
          HOST_CXX='$(CXX)'
          HOST_LD='$(LD)'
! 	if test "$CC" == "icl"; then
! 	    AR='xilib -NOLOGO -OUT:"$@"'
! 	else
!             AR='lib -NOLOGO -OUT:"$@"'
! 	fi
          AR_FLAGS=
          RANLIB='echo not_ranlib'
          STRIP='echo not_strip'
***************
*** 6520,6526 ****
          MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
          MOZ_XPCOM_OBSOLETE_LIBS='$(LIBXUL_DIST)/lib/xpcom_compat.lib'
          if test $_MSC_VER -ge 1400; then
!             LDFLAGS="$LDFLAGS -NXCOMPAT -SAFESEH"
                          PROFILE_GEN_CFLAGS="-GL"
              PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT"
                                                                                                  PROFILE_USE_CFLAGS="-GL -wd4624 -wd4952"
--- 6537,6547 ----
          MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
          MOZ_XPCOM_OBSOLETE_LIBS='$(LIBXUL_DIST)/lib/xpcom_compat.lib'
          if test $_MSC_VER -ge 1400; then
! 	    if test "$CC" == "icl";then
! 		LDFLAGS="$LDFLAGS -NXCOMPAT -SAFESEH:NO"
! 	    else
! 		LDFLAGS="$LDFLAGS -NXCOMPAT -SAFESEH"
! 	    fi
                          PROFILE_GEN_CFLAGS="-GL"
              PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT"
                                                                                                  PROFILE_USE_CFLAGS="-GL -wd4624 -wd4952"
diff -cr mozilla-central.org/gfx/cairo/libpixman/src/Makefile.in mozilla-central/gfx/cairo/libpixman/src/Makefile.in
*** mozilla-central.org/gfx/cairo/libpixman/src/Makefile.in	Thu Dec 11 04:06:59 2008
--- mozilla-central/gfx/cairo/libpixman/src/Makefile.in	Tue Feb 10 14:03:23 2009
***************
*** 63,74 ****
--- 63,76 ----
  
  # Build MMX code either with VC or with gcc-on-x86
  ifdef _MSC_VER
+ ifneq (icl,$(CC))
  ifeq (86,$(findstring 86,$(OS_TEST)))
  USE_MMX=1
  #USE_SSE2=1
  MMX_CFLAGS=
  endif
  endif
+ endif
  
  ifdef GNU_CC
  
diff -cr mozilla-central.org/gfx/thebes/public/gfxMatrix.h mozilla-central/gfx/thebes/public/gfxMatrix.h
*** mozilla-central.org/gfx/thebes/public/gfxMatrix.h	Thu Dec 11 04:06:23 2008
--- mozilla-central/gfx/thebes/public/gfxMatrix.h	Thu Feb 12 18:46:24 2009
***************
*** 64,70 ****
   *           \ tx ty 1 /   \         1          /
   *
   */
! struct THEBES_API gfxMatrix {
      double xx; double yx;
      double xy; double yy;
      double x0; double y0;
--- 64,72 ----
   *           \ tx ty 1 /   \         1          /
   *
   */
! //struct THEBES_API gfxMatrix {
! class THEBES_API gfxMatrix {
!  public:
      double xx; double yx;
      double xy; double yy;
      double x0; double y0;
diff -cr mozilla-central.org/gfx/thebes/public/gfxRect.h mozilla-central/gfx/thebes/public/gfxRect.h
*** mozilla-central.org/gfx/thebes/public/gfxRect.h	Thu Dec 11 04:06:59 2008
--- mozilla-central/gfx/thebes/public/gfxRect.h	Thu Feb 12 18:51:47 2009
***************
*** 41,47 ****
  #include "gfxTypes.h"
  #include "gfxPoint.h"
  
! struct THEBES_API gfxCorner {
      typedef int Corner;
      enum {
          // this order is important!
--- 41,49 ----
  #include "gfxTypes.h"
  #include "gfxPoint.h"
  
! //struct THEBES_API gfxCorner {
! class THEBES_API gfxCorner {
!  public:
      typedef int Corner;
      enum {
          // this order is important!
***************
*** 54,60 ****
  };
  
  
! struct THEBES_API gfxRect {
      // pt? point?
      gfxPoint pos;
      gfxSize size;
--- 56,64 ----
  };
  
  
! //struct THEBES_API gfxRect {
! class THEBES_API gfxRect {
!  public:
      // pt? point?
      gfxPoint pos;
      gfxSize size;
diff -cr mozilla-central.org/gfx/thebes/src/gfxMatrix.cpp mozilla-central/gfx/thebes/src/gfxMatrix.cpp
*** mozilla-central.org/gfx/thebes/src/gfxMatrix.cpp	Thu Dec 11 04:06:23 2008
--- mozilla-central/gfx/thebes/src/gfxMatrix.cpp	Thu Feb 12 18:43:57 2009
***************
*** 41,46 ****
--- 41,47 ----
  #define CAIRO_MATRIX(x) reinterpret_cast<cairo_matrix_t*>((x))
  #define CONST_CAIRO_MATRIX(x) reinterpret_cast<const cairo_matrix_t*>((x))
  
+ 
  const gfxMatrix&
  gfxMatrix::Reset()
  {
diff -cr mozilla-central.org/js/src/Makefile.in mozilla-central/js/src/Makefile.in
*** mozilla-central.org/js/src/Makefile.in	Thu Dec 11 04:07:00 2008
--- mozilla-central/js/src/Makefile.in	Tue Feb 10 14:56:41 2009
***************
*** 65,70 ****
--- 65,73 ----
  MODULE_OPTIMIZE_FLAGS = -O2 -ip
  #XXX: do we want different INTERP_OPTIMIZER flags here?
  endif
+ # link libstdc++
+ HOST_EXTRA_LIBS += -lstdc++
+ EXTRA_LIBS += -lstdc++
  else # not INTEL_CXX
  MODULE_OPTIMIZE_FLAGS = -Os -fstrict-aliasing $(MOZ_OPTIMIZE_SIZE_TWEAK)
  # Special optimization flags for jsinterp.c
diff -cr mozilla-central.org/js/src/configure mozilla-central/js/src/configure
*** mozilla-central.org/js/src/configure	Thu Dec 11 04:12:09 2008
--- mozilla-central/js/src/configure	Mon Feb  9 20:27:12 2009
***************
*** 2709,2714 ****
--- 2709,2726 ----
          CXX_VERSION=`"${CXX}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`
          _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'`
  
+ 	if test "$CC" == "icl"; then
+             CC_VERSION=15.00.21022.08
+             _CC_MAJOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $1 }'`
+             _CC_MINOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $2 }'`
+             _CC_RELEASE=`echo ${CC_VERSION} | $AWK -F\. '{ print $3 }'`
+             _CC_BUILD=`echo ${CC_VERSION} | $AWK -F\. '{ print $4 }'`
+             _MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}
+ 
+             CXX_VERSION=15.00.21022.08
+             _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'`
+ 	fi
+ 
          if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
              { echo "configure: error: The major versions of \$CC and \$CXX do not match." 1>&2; exit 1; }
          fi
***************
*** 6187,6192 ****
--- 6199,6205 ----
          LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
          MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
          MOZ_XPCOM_OBSOLETE_LIBS='$(LIBXUL_DIST)/lib/xpcom_compat.lib'
+ 	if test "$CC" != "icl"; then
          if test $_MSC_VER -ge 1400; then
              LDFLAGS="$LDFLAGS -NXCOMPAT -SAFESEH"
                          PROFILE_GEN_CFLAGS="-GL"
***************
*** 6197,6202 ****
--- 6210,6216 ----
                 LDFLAGS="$LDFLAGS -DYNAMICBASE"
              fi
          fi
+ 	fi
      fi
      cat >> confdefs.h <<\EOF
  #define HAVE_SNPRINTF 1