From a6c6251a4638a581bedb9d726b4e2350e665e8ad Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us"
 <benjamin%smedbergs.us@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 17 Jul 2007 13:31:29 +0000
Subject: [PATCH] Bug 368854 - Use new compiler/linker flags added in VC8 to
 improve security, r=luser

git-svn-id: svn://10.0.0.236/trunk@230109 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/configure.in                    | 3 +++
 mozilla/xpcom/typelib/xpidl/Makefile.in | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/mozilla/configure.in b/mozilla/configure.in
index f981fd0d983..c216dd61c2e 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -1860,6 +1860,9 @@ case "$target" in
         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 $_MSC_VER -ge 1400; then
+            LDFLAGS="$LDFLAGS -NXCOMPAT -SAFESEH"
+        fi
     fi
     MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg$(MOZ_BITS)$(VERSION_NUMBER),$(DEPTH)/jpeg)'
     MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
diff --git a/mozilla/xpcom/typelib/xpidl/Makefile.in b/mozilla/xpcom/typelib/xpidl/Makefile.in
index cf1462a303f..0a52e4501c7 100644
--- a/mozilla/xpcom/typelib/xpidl/Makefile.in
+++ b/mozilla/xpcom/typelib/xpidl/Makefile.in
@@ -142,6 +142,10 @@ LDFLAGS += \
 	-NODEFAULTLIB:LIBC \
 	$(NULL)
 
+ifneq (,$(filter-out 1700 1710,$(_MSC_VER)))
+LDFLAGS += -SAFESEH:NO
+endif
+
 ifdef STATIC_LIBIDL
 LDFLAGS += -NODEFAULTLIB:MSVCRT
 endif