From 1be27c47bc0ce9c2117d7b3f7eba77fd01e746b8 Mon Sep 17 00:00:00 2001
From: "julien.pierre.boogz%sun.com" <julien.pierre.boogz%sun.com>
Date: Thu, 13 Sep 2007 01:37:34 +0000
Subject: [PATCH] Fix for bug 383857 . NSPR still uses the MSVC -G5 flag .
 r=wtc

---
 nsprpub/configure    | 3 ---
 nsprpub/configure.in | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/nsprpub/configure b/nsprpub/configure
index ae17ca9c7f2..2cd5974afba 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -4042,9 +4042,6 @@ EOF
         
         if test "$OS_TARGET" = "WINNT"; then
             CFLAGS="$CFLAGS -GT"
-            if test "$CPU_ARCH" = "x86"; then
-                CFLAGS="$CFLAGS -G5"
-            fi
             LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
             LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         else
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 2eda31b9c5f..10908eb4839 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1560,9 +1560,6 @@ tools are selected during the Xcode/Developer Tools installation.])
         
         if test "$OS_TARGET" = "WINNT"; then
             CFLAGS="$CFLAGS -GT"
-            if test "$CPU_ARCH" = "x86"; then
-                CFLAGS="$CFLAGS -G5"
-            fi
             LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
             LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         else